update legislators
add timeout, callbacks to web-based call. addresses #20
Merge branch 'master' into scalability

Conflicts:
	app.py