Some stuff necessary for the alton towers gig. Needs some GUI work.
Merge branch 'master' of https://github.com/horizon-institute/vicarious

Conflicts:
	Vicarious/GeneralRenderer/Components/NumberDisplay.py
	Vicarious/GeneralRenderer/Model.py
	Vicarious/GeneralRenderer/controllers.py
	Vicarious/GeneralRenderer/vlc/vlcBuffer.py
conflict resolution