Merge pull request #2 from gcgmartin/master

Diamond collector with basic functionality complete.
Merge pull request #4 from gcgmartin/master

Improvements to layout and bug fixes.