Refs #7156 - Addressing more rubocop cops
Merge pull request #4750 from daviddavis/temp/20141016113818

Refs #7156 - Addressing more rubocop cops