Remove cruft that old versions of diamond needed.  New version is packaged better.
Some more clean up.
Merge pull request #19 from scottso/clean_up

Clean up