Ran tidy and added fix for 338
Merge branch 'master' of github.com:LyonsLab/coge