Added/fixed specs Update spec/factory to allow Factory#new without opts Conflicts: app/models/key.rb
* Remove trailing whitespace * Converts hard-tabs into two-space soft-tabs * Remove consecutive blank lines