Merge pull request #23 from amlweems/testing

Lots of fixes to various things, working login, ping seems to be broken
Working login and keepalive\!