Miscellaneous updates, including moving to RSpec 3 beta1