Client and server changes. Fixing stuff that somehow got deleted.

-Steven
Merge branch 'master' of https://github.com/Alchai/Tempus