Updated .gitignore to ignore .DS_Store files
Merge branch 'master' into handlebars-integration

Conflicts:
	.gitignore