tried normalizing by phat, not working
tinkering with the branch
fixed mistake in expendituer shares in calc_gv
Everything is working.  I am about to refactor into a simple class to
make using the Chinese data easier.
wrapped everything in an obj orientated caller
Going throught fixing mistakes in tax calculation
added sale_tax files
working pure social welfare version
Merge branch 'phat_norm'

I resolved some very basic conflicts here -- nothing serious.
Conflicts:
	calc_gv.py
	run_est.py
	upd_alp.py