Installed RSpec 3.
Specs converted to RSpec 3 format.
Merge branch 'master' into staging