Upgraded specs to RSpec 3.0
Merge branch 'develop'