Refactor email_already_signed_in? and insert_user (now insert) methods to UserMapper.
Convert all views to HAML