Light testing.
Merge branch 'master' into jason

Conflicts:
	public/scripts/client.coffee
Merge branch 'master' into jason

Lighting is now working.
Merge branch 'master' into jason

Conflicts:
	public/scripts/client.coffee
Merge branch 'master' into sean

Conflicts:
	public/scripts/client.coffee