cleanup & sundry
cleanup & sundry
Merge pull request #7 from thrisp/master

miscellaneous cleanup