Fix spec issue introduced by recent renaming
Bump up RSpec to 3.x and address deprecation issues.
Merge pull request #14 from Swapt/feature/rspec_3

Fix build and update to RSpec 3.x