Merge pull request #8 from hintjens/master

Various project cleanups
Fix whitespace errors
Merge pull request #13 from hurtonm/master

Fix whitespace errors
Fixed issue #12