Cleaning some cruft
Merge pull request #256 from benjello/dev

Cleaning some cruft
Fixing conflicts