for numpy 1.6
Merge pull request #24 from mhvk/older-numpy

for numpy 1.6
Merge branch 'master' into gmos/split_up_slit_cutting

Conflicts:
	geminiutil/gmos/gmos_basics.py