Gruntfile.coffee, coffeelint and other stuff from branch coffee.
Merge branch 'master' into coffee

Conflicts:
	Gruntfile.coffee