fixing build
Merge branch 'master' of github.com:scottrogers/boilerplate