Several util fixes:

* Kill esniper process if it does not respond to SIGTERM
* Fix broken file deletion in cleanup
* Fix tab/space mix