Merge pull request #2 from scottso/missing_end

Missing end
Merge pull request #3 from att-cloud/master

Syncing up
Fix some foodcritic complaints.
Merge pull request #3 from scottso/foodcritic_fixes

Foodcritic fixes