Better collision feedback
Merge branch 'master' of https://github.com/henryplumb/PiBot