Specify server during login. Some cleanup
Merge pull request #2 from joel-sparc/misc

Specify server during login. Some cleanup