grunt coffee:clean
README.md
README.md
Changing branch within bin run, then providing instructions to run `grunt setup`
Fixing bin script message
Merge branch 'master' into express

Conflicts:
	tasks/setup.coffee