Devise - and rspec

Need to merge this to get rspec into master