Rubocop: Aligning multi-line arrays and hashes
Merge pull request #2984 from daviddavis/temp/20130917184819

Rubocop: Aligning hashes and arrays