Merge pull request #1 from ben-zen/master
authorTommy Guy <guy@cs.toronto.edu>
Mon, 10 Nov 2014 04:20:26 +0000 (20:20 -0800)
committerTommy Guy <guy@cs.toronto.edu>
Mon, 10 Nov 2014 04:20:26 +0000 (20:20 -0800)
Whitespace and a couple fixes.


Trivial merge

Benjamin Mako Hill || Want to submit a patch?