Debugging of Neq stacking
Merge branch 'master' of https://github.com/mikemoorester/ESM
Fixed conflict
Conflicts:
	nadir.py
Merge branch 'master' of https://github.com/mikemoorester/ESM
Fixed Gamit weighting bug. Fixed uncertainities bug.