indentation hell
Merge pull request #33 from mreiferson/this_has_always_annoyed_me_33

this has always bothered me