Merge branch 'master' into mda-go1.6

.travis.yml

@@ -0,0 +1,13 @@
+language: go
+go:
+    - "1.5.1"
+addons:
+  apt:
+    packages:
+      - libflac-dev
+before_install:
+  - go get github.com/axw/gocov/gocov
+  - go get github.com/mattn/goveralls
+  - if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
+script:
+  - $HOME/gopath/bin/goveralls -service=travis-ci

README.md

@@ -4,6 +4,10 @@ These bindings allow decoding and encoding of [FLAC](https://xiph.org/flac/)
 format audio data from [Go](http://golang.org/) using the
 [libFLAC](https://xiph.org/flac/api/) library.
 
+[![Build Status](https://travis-ci.org/cocoonlife/goflac.svg)](https://travis-ci.org/cocoonlife/goflac)
+
+[![Coverage Status](https://coveralls.io/repos/cocoonlife/goflac/badge.svg?branch=master&service=github)](https://coveralls.io/github/cocoonlife/goflac?branch=master)
+
 ### Installation
 
     go get github.com/cocoonlife/goflac