Working on some code clean up, this is the first iteration and just includes code formatting
Updated a few things that I didn't notice the first pass
A few more things I missed the first go around
Merge pull request #50 from JoshuaEstes/codeCleanupTakeOne

Working on some code clean up
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  A few more things I missed the first go around
  Updated a few things that I didn't notice the first pass
  Working on some code clean up, this is the first iteration and just includes code formatting