Reformatting, removing commented out stuff.
Merge pull request #5 from martinthomson/whitespace

Reformatting, removing commented out stuff.