Add set_status method, and insert calls to the method in relevant contexts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	collaboration.py
Remove needless call to set_status
Merge branch 'hotfix/rm-set-status-call'
Merge pull request #9 from alexparker/master

Update Collab Server Status + Connection status