Fixed merge conflicts in the simulator
Corrected method names for Khepera3, added direct setting of speeds in unicyle model
Streamlined supervisor, added more abstract methods, PEP8
Started implementation of a Khepera3 supervisor
Merge merge merge... overwrite of simulator.py