Update some scaffolds
Merge branch 'master' of github.com:everett1992/bamboo