Reorganized run methods
Merge branch 'master' of git://github.com/theclg/roboops

Conflicts:
	gui/gui.py
	robot/serialize.py