Ignore .DS_Store files.
Replace tabs with two spaces.
Remove trailing whitespace.
Merge pull request #20 from kaleworsley/tidyup

General tidy up