Update README.md
use global promiseGenerator
Merge branch 'master' of github.com:gustavpursche/sandglass-frontend
Merge branch 'master' into gulp+less

Conflicts:
	.gitignore
	sandglass/public/js/routes.js