Removed some commented out code and such

Removed some commented out code and such
Merge pull request #6 from kevinsigwart/master

Removed some commented out code and such