Removed the timer from the module as that was unneeded; work-in-progress.
Merge branch 'master' of https://github.com/khawajaumarfarooq/znc

Conflicts:
	modules/buddylist.cpp