allow specifying upstart kill timeout
Merge pull request #27 from ConradIrwin/kill-timeout

allow specifying upstart kill timeout