updated readme mildly
Merge branch 'master' of github.com:WhisperSystems/TextSecure-iOS
changing server structure to support new api
fixed merge conflict in server