Clean up whitespace in specs
Fix rspec deprecation warnings
Update to RSpec 3