Convert tabs to spaces, general tidies.
Merge pull request #1 from andytait/master

Convert tabs to spaces, general tidies.