Updated checkstyle file again

Characters per line at 79
Missing newline at EOF triggering warning now
Merge remote-tracking branch 'upstream/master'