pull in recent changes

Use the new Ruby 1.9 hash syntax.