Change ruby version to 2.0.0
Merge branch 'update-ruby-version' of heroku.com:shielded-brook-6854

Conflicts:
	Gemfile