Added checkstyle and fixed code to obey it (thanks @meggawatts).
Merge remote-tracking branch 'upstream/master' into skulls