Small fixes
Merge branch 'master' of github.com:square/shuttle