cleaned up warnings (refs #4024)
Merge pull request #4080 from aeslaughter/contrib

cleaned up warnings