Changes to fix cppcheck issues
Merge pull request #54 from pantheon-systems/20130417-cppcheckcleanup

Changes to fix cppcheck issues