Merge branch 'develop'
version bump
use the correct handlebars bower repo
version bump
clean up grunt file globbing
Merge branch 'master' into develop