update NEWS
fix tests
Merge branch 'show-locations' into truckee

Conflicts:
	src/allmydata/test/test_web.py