Minor fixes from client testing
Merge branch 'master' of github.com:dmoranj/catan-servers