Going through and knocking out some bugs I noticed
Merge pull request #44 from travisvalentine/cleanup_stuff

Going through and knocking out some bugs I noticed