login is now always modal, new style
fix merge conflicts
Merge pull request #69 from billsaysthis/login-ajax-jan31

login is now always modal, new style