First draft of collision events
Test routine for basic collision test
Merge branch 'master' into pymonocle-start