Upgrade to RSpec 3 and clean up deprecations
Minor updates