pull in recent changes

Line is too long. [100/80]<br>Use the new Ruby 1.9 hash syntax.