Bastion: Fixing reference to underscore 1.3.1
Merge pull request #2830 from daviddavis/temp/20130828103352

Bastion: Fixing reference to underscore 1.3.1
Merge remote-tracking branch 'upstream/master' into rubocop