Refactor for minimality since we're on nginx now
Merge remote-tracking branch 'origin/master'

Conflicts:
	companioncube.jade
	img/logo.png
	index.jade