Fix a minor typo in a comment: srvious => various
Merge remote-tracking branch 'webmat/patch-1'
Merge remote-tracking branch 'origin/master' into berkshelf