Update RSpec to 3.x with associated config changes