parse changes
Merge branch 'master' of github.com:typpo/millenium-viz

Conflicts:
	data/parse.py
control zoom a bit better
Merge branch 'master' of github.com:typpo/millenium-viz

Conflicts:
	web/main.js