RSPEC AND CUCUMBER CHANGES FROM ALISON - FORGOT TO COMMIT BEFORE MERGING TO MASTER DAMMIT!