Un-ignoring rvmrc files
New rvmrc file
Updating Ruby and Passenger
Updating rake
Setting the gems straight
Removing capybara-webkit

Two tests needed to be modified to work with Selenium.  Also, capybara
gem is restricted to versions prior to 2.0.0.
DAM-247: Rockhall::DatastreamConversion class
Merge branch 'hh5'

Conflicts:
	.rvmrc
	Gemfile
	Gemfile.lock
	features/archivist/edit_videos.feature
	features/rockhall/rockhall_pbcore_nodes.feature
Post hh5 merge: syncing branchs
Fedora rake tasks delete items accoring to configured pid_space
Updating test_prep script
Removing browser compatibility check--it's breaking tests
Merge branch 'master' into hh5
Maintainging separate gemset