File rename, cruft removal.
Changes required to make Diamond compile on OS X Mavericks.
Merge pull request #6 from danbi/master

Some changes to compile on recent OS X