added a space to the haproxy template

without the space it was spitting out 
```
timeout connect50
```
instead of 
```
timeout connect 50
```
Merge pull request #92 from andrewwatson/patch-1

added a space to the haproxy template
Fix golint errors
Add badge for docs
Fix more golint errors
Don't merge config templates entries; Fixes #94)
Update merge test to be clearer
Append Config.ConfigTemplate entries
Refactor buildConfig to handle non-existent and empty directories
Do not use the Travis Docker containers
Merge pull request #97 from hashicorp/sethvargo/buildConfig

Refactor buildConfig to handle non-existent and empty directories
Do not panic if qm is nil
Allow colons in KeyPrefixes (ls and tree too)
make parseJSON to handle top level JSON arrays
Make decodeJSON more general
Remove reference to DecodeString (bad rebase in the past?)