Revise collision implementation

[amacati]

• Restrict ncon for larger swarms
• Properly return integer arrays instead of masking
• Check if we can cope with large transients