Cleanup of library a bit.
Merge branch 'master' of github.com:spectrumbranch/scurvy