I'm getting flycheck from melpa now
Clean up whitespace as part of project clean
Merge remote-tracking branch 'upstream/master'