Adding in upstart conf, improving socket parsing
increasing grabbing distance
Merge remote-tracking branch 'bone/master'