Merge remote-tracking branch 'origin/master' into logo

.travis.yml

@@ -0,0 +1,8 @@
+language: go
+
+go:
+  - 1.0
+  - 1.1
+  - 1.2
+  - 1.3
+  - tip

README.md

@@ -3,7 +3,7 @@
 
 # JSON Library for Go
 
-[![Godoc](http://img.shields.io/badge/godoc-reference-blue.svg?style=flat)](https://godoc.org/github.com/antonholmquist/jason) [![license](http://img.shields.io/badge/license-MIT-red.svg?style=flat)](https://raw.githubusercontent.com/antonholmquist/jason/master/LICENSE)
+[![Godoc](http://img.shields.io/badge/godoc-reference-blue.svg?style=flat)](https://godoc.org/github.com/antonholmquist/jason) [![license](http://img.shields.io/badge/license-MIT-red.svg?style=flat)](https://raw.githubusercontent.com/antonholmquist/jason/master/LICENSE) [![Build Status](https://travis-ci.org/antonholmquist/jason.svg?branch=master)](https://travis-ci.org/antonholmquist/jason)
 
 
 

jason.go

@@ -50,17 +50,15 @@ func NewValueFromBytes(b []byte) (*Value, error) {
 func objectFromValue(v *Value, err error) (*Object, error) {
 	if err != nil {
 		return nil, err
-	} else {
-
-		o, err := v.AsObject()
+	}
 
-		if err != nil {
-			return nil, err
-		} else {
-			return o, nil
-		}
+	o, err := v.AsObject()
 
+	if err != nil {
+		return nil, err
 	}
+
+	return o, nil
 }
 
 func NewObjectFromBytes(b []byte) (*Object, error) {
@@ -526,7 +524,7 @@ func (v *Value) String() string {
 	f, err := json.Marshal(v.data)
 	if err != nil {
 		return err.Error()
-	} else {
-		return string(f)
 	}
+
+	return string(f)
 }