clj-sp/matasano — pull request #6 by nberger (2014-09-23 21:49:32+00:00)
Title: Merge master into refactoring branch

Puts this branch in sync with master, so it can be merged
and we can continue working from there