add handlebars and less
merge origin/master
Merge remote-tracking branch 'github/master'

Conflicts:
	.vimrc