Fix whitespace issues in source
Include checkstyle, and start work on fixing formatting
Merge with master to get checkstyle config