Merge branch 'master' into dev

Conflicts:
	web_app/disambiguator.py
	web_app/templates/index.html
Merge branch 'master' into dev
begin work on data munging