FIX: Deal with indices more cleanly for numpy 1.8
Merge pull request #579 from Eric89GXL/numpy-fixes

FIX: Deal with indices more cleanly for numpy 1.8