Herding Spikes 2 Lightning

• new detection code by @lkct
• small further improvements to improve quality of sorting
• old detection code is also included for compatibility
• small but essential fixes since first 0.4 release