update gulp-minify-css version
add .DS_Store files to gitignore
Merge branch 'master' into angular

Conflicts:
	.gitignore
	package.json
Merge branch 'angular' of github.com:leonidas/gulp-project-template into angular