Fix merge: 268003d
Merge branch 'spencer' of https://github.com/aaronmjacobs/Scribe into spencer