Merge pull request #89 from hipsterwannabe/ashwebb

Cleaned up code, reformatted and deleted unnecessary files.