Have map follow phone.

* use smaller random distance for smoke test
Merge branch 'dev' of github.com:jrconlin/wmf into dev

Conflicts:
	static/index.html
	test/smoketest.py