Remove grunt setup:branch in favor of doing merges manually
Merge branch 'master' into express

Conflicts:
	README.md