updates
Merge branch 'master' of https://github.com/mattludwigs/generator-bean-stack