using xpath to scrape web
Merge branch 'master' into xmllint

Conflicts:
	Makefile
Merge branch 'master' into xmllint
nicer Makefile
update traffic info
Merge branch 'xmllint'
fix typos