couple of small code cleanups
Merge remote-tracking branch 'upstream/master'
cleaned up a bunch of leftover tabs and converted each to 4 spaces
Merge pull request #188 from Ventrella/master

I have a bunch of things to pull.