Got it working!
Merge branch 'ian'
Hopefully fixed merging problem
Tried to add some sensor stuff