Add the easy-kill package
Code style
Pull in upstream changes