Merge pull request #93 from ChristianMurphy/develop

More Login Fixes and Testing