Merge branch 'master' of github.com:humanmade/hm-base
ignore backups
Merge branch 'refs/heads/master' into gruntfile

Conflicts:
	.gitignore