Use a non-broken version of the json gem.
Fix Rakefile to work with recent RDoc.
Merge branch 'master' of git://github.com/envato/pagerduty

Conflicts:
	pagerduty.gemspec