Jade-ification, general cleanup.
Merge pull request #36 from dklann/master

Jade-ification, general cleanup.