Upstream changes

Automatically opened by http://forkbomb.io
Redundant curly braces around a hash parameter.<br>Use the new Ruby 1.9 hash syntax.<br>Line is too long. [152/80]<br>Surrounding space missing for operator '=>'.<br>Space inside { missing.<br>Space inside } missing.