Merge pull request #221 from alexmckenley/dev

login button now reflecting correct state
using express session cookie instead of angular cookie. Also refactored logout to send the username passed in the url
Merge branch 'login2' into dev