removed twitter and cleaned up authentication code.
removed twitter and cleaned up authentication code.
deleted omniauth_callbacks_controller
fixed merge conflicts