make permalinks to posts pretty with a slash instead
Merge branch 'staging' into remove-bootstrap

Conflicts:
	_config.yml