Merge branch 'release/0.7.1' into develop
Typo
Merge branch 'develop'
Emergency bugfix
Merge branch 'develop'
Merge branch 'master' of https://github.com/jupl/brunch-toolchain into develop

Conflicts:
	README.md
	server/prerender/index.js
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
Add jQuery and Normalize to utilities section
Don't include Prerender packages by default.
Make packages available to install via jake task
Set up Prerender only if packages are available
Make setupRoutes consistent with setupPrerender
Update change log
Minor rearrange
Move PhantomJS to a regular dependency
Update change log
Do not install test-related packages by default
Edit package.json directly instead of npm's --save
Update Sinon Chai