Login bug fix in progress
conflicts fixed
Bug causing broken checkout all fixed
Merge pull request #18 from wvmitchell/fixing_login_bugs

Bug causing broken checkout all fixed
Fixed conflicts
put back options action in user_sessions controller
in progress login options forward to checkout
fixed conficts