Merge pull request #531 from RosettaCommons/everyday847/cppcheck Cleaning up some of the more egregious cppcheck errors