Through 9-3 in the book
Merge branch 'master' of https://github.com/danielseltzer/microscope

Conflicts:
	client/helpers/errors.js
	client/helpers/router.js
	client/views/includes/errors.js