Use the server string for consistency
Merge branch 'master' of https://github.com/UG-Proto/uGather-iPhone

* 'master' of https://github.com/UG-Proto/uGather-iPhone:
  clean up