Fix -Wshadow warnings
Merge pull request #228 from libMesh/shadow_fixes

Fix -Wshadow warnings