Formatting update
Merge branch 'master' of github.com:surevine/xmpp-profile-server