Add cleanup to pretender server
Make it a quick fix
Merge branch 'develop'
Merge branch 'master' of https://github.com/jupl/brunch-toolchain into develop

Conflicts:
	server/prerender/index.js