20130405 build.

Includes a few small tweaks. Fixes #93.