NoamB/sorcery — pull request #219 by imajes (2012-02-21 17:49:00+00:00)
Title: a monster merge :(

Covers -

* whitespace fixin's. This helps us vim users not go insane
* improvements to the crypt routines
* re-implementation of the config init, which relies on an external doc rather than an internal doc format.