Fix terminate() and add kill()

See issue https://github.com/Araq/Nimrod/issues/1558