Changes
Merge branch 'master' of https://github.com/mikemoorester/ESM

Conflicts:
	nadir.py
Merge branch 'master' of https://github.com/mikemoorester/ESM
No idea why, still getting the hang of git
Putting together a ESM which takes into account errors in satellite
antenna models