Cleaned up the synchronization parts.
Merge branch 'master' of github.com:DPMI/mp

Conflicts:
	src/timesync.c
fixed conflict.