fml
Merge remote-tracking branch 'origin/master' into requirejs
cool cake refactor
got rid of bower
kool
versions bump
some cakefileness
jade vbump
Merge remote-tracking branch 'origin/master' into requirejs

Conflicts:
	Gruntfile.coffee
	bower.json