updated server sync scripts to say 'server' in xmessage prompt
Merge branch 'master' into laptop