Merge remote-tracking branch 'upstream/master' into feature/1.4-Upgrade

Upgrades Vapour from upstream to version 1.4.

Conflicts:
	assets/css/screen.css
	default.hbs
	index.hbs
	post.hbs