Style cleanup, tabs and whitespace

Removed all line ending whitespace.

Changed tabs to spaces and reindented to match in-house style.
Reindenting index to two spaces

Just matching in house style.
Fixing semi-colon errors

These lines should end with semicolons to prevent ambiguous code.
Removing OSX system specific DS_Store file
Merge branch 'style-cleanup'