Reorder the Gruntfile a bit
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	Gruntfile.js