Slowly cleaning up the code a bit
Merge branch 'master' of https://github.com/relloydjr/BitJockey