Fixing threading issues with pygame pumps
- adding thread safe pygame event module
- trying optimistic picasso canvas draw
- getting rid of direct pygame pumps and event gets
Merge pull request #40 from elElmo/master

Hotfix for threading issue with pygame's pump
Changing default launch to gui
Merge remote-tracking branch 'upstream/master'
Adjusting colour mapping
- adding in new colour code from last week's lab
- fixing highlight code to give more accurate colour
Adding draggable windows, disabling buttons during dialog
- dialogs now draggable
- buttons and territories no longer highlight in dialog mode
Forcing highlight when dragging dialog, setting no sleep
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	risk.py