small cleanup, using tabletop for impressions
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/header.jade
	templates/page.jade