created a bunch of partials. removed brs in forms and added space with css.
fixed conflict in registrations/new.html.haml
commented out failing authenticatoins_controller specs
fixed merge conflicts