main.go -> app.go
Merge branch 'master' of github.com:casey/shipyard