Continued working towards rover mapping functionality.
Merge branch 'master' of https://github.com/aore/mars-rover into aore-master

Conflicts:
    control/oi.py
More rover changes to add `env` plotting fuctionality.
renamed distance to dist
Rover fixes
Added Wedge import.
Merge branch 'master' of https://github.com/dwtj/mars-rover
Debugging the plotting functionality of Rover.
Made complete rewrite of `rover.py` by breaking it up into three classes.
Merge branch 'dwtj-master'

Conflicts:
	control/rover.py