begin merging kytv/68-multi into ticket68

note: this is a non-working state

Conflicts:
	src/allmydata/client.py
	src/allmydata/test/test_web.py
	src/allmydata/web/root.py
	src/allmydata/web/welcome.xhtml
Merge leif/ticket68 into david-68work

Conflicts:
	src/allmydata/client.py
	src/allmydata/test/test_web.py
	src/allmydata/web/root.py
	src/allmydata/web/welcome.xhtml