Merge pull request #256 from benjello/dev

Cleaning some cruft
Fixes to run 2007 and 2008