Merge pull request #350 from apriendeau/update-travis

add go 1.6 to travis