Introduced Doppler to the rspec suit to get tests passing again. Also cleaned up the user model