Small changes.

- Renamed killjoin() to kill_join()
- Added check to see if 'join' timer is in var.TIMERS before attempting to
  cancel