don't remove handlebars
Merge branch 'master' of github.com:oreillymedia/atlas_assets

Conflicts:
	lib/atlas_assets/version.rb