Merge pull request #59 from ethanhugg/cosmetic

Fixed warnings found by clang.  Removed some trailing whitespace.