cleaned things up, added basic haddocks
Merge pull request #1 from bitemyapp/master

cleaned things up, added basic haddocks