ofZach/ofBook — pull request #2 by mikewesthad (2014-08-31 04:44:15+00:00)
Title: Fixing merge conflicts created by my recent PR to master (#70)

We should merge your branch into master as soon as it's able to be auto-merged