jade maintainers are douchebags
versions bump ya all
Merge remote-tracking branch 'origin/master' into chaplin

Conflicts:
	bower.json
	package.json
	views/server/layout.jade