Merge pull request #50 from ajjohnston/master

Some more cleanups