Merge branch 'master' of ssh://192.168.1.102/~/git/sailbot2013

Conflicts:
	sailbot/boat.py
Merge branch 'master' of ssh://192.168.1.102/~/git/sailbot2013

Conflicts:
	sailbot/boat.py
Merge branch 'master' of ssh://192.168.1.102/~/git/sailbot2013

Conflicts:
	sailbot/boat.py
Merge branch 'master' of ssh://192.168.1.102/~/git/sailbot2013

Conflicts:
	sailbot/boat.py
Catch and log all exceptions
Catch and log all exceptions
Merge branch 'master' of ssh://192.168.1.102/~/git/sailbot2013

Conflicts:
	sailbot/boat.py
Merge branch 'master' of ssh://192.168.1.102/~/git/sailbot2013

Conflicts:
	sailbot/boat.py
Merge branch 'master' of ssh://192.168.1.102/~/git/sailbot2013

Conflicts:
	sailbot/boat.py
Merge branch 'master' of github.com:AberSailbot/sailbot2013