Fix behaviour on death.
Merge branch 'master' into jason

Conflicts:
	public/scripts/client.coffee