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

Conflicts:
	hiresExtract/combine.py
added c extension for get_indices