Fix errors and deprecation warnings

Use the new Ruby 1.9 hash syntax.