Merge branch 'master' of github.com:astroScott/hiresExtract

Conflicts:
	hiresExtract/combine.py
Merge branch 'master' of github.com:astroScott/hiresExtract

Conflicts:
	hiresExtract/combine/combine.py