Merge branch 'test' of github.com:whittenjaw85/pysimiam
Commented Simulator 'raise Exception' - readconfig
Merge branch 'test' of github.com:whittenjaw85/pysimiam

Conflicts:
	scripts/simulator.py
Switched simulator to fixed time intervals
Changed max/min speed multiplier
Merge branch 'qtsimiam' of github.com:whittenjaw85/pysimiam

Conflicts:
	scripts/simulator.py
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
Merge branch 'test' of github.com:whittenjaw85/pysimiam
Returning robot type from xml parser.
Merge branch 'master' of https://github.com/whittenjaw85/pysimiam into test