Saving state, after a long time away.
Merge branch 'master' of github.com:jmervine/kitchen-bookshelf

Conflicts:
	Berksfile