Merge pull request #222 from alexmckenley/dev

Refactored login to use express cookies