Clean up
Merge branch 'master' of github.com:davidashman/b2-template
Clean up