more merge fixes
authentication improvements

refactored the User authentication code to favor model-side logic over controller
logic, as well as adding redirect functionality. /login?redirect=url will redirect
to url upon successful login