Use ruby 1.8.7 hash syntax
Merge branch 'master' of github.com:benprew/pony

Conflicts:
	Gemfile.lock