Update Gemfile re: debugging in either Ruby 1.9 or 2.0.
Merge branch 'master' into xmpp

Conflicts:
	Gemfile
	Gemfile.lock