FIX: Deal with indices more cleanly for numpy 1.8

Also contains some misc cleanups (including making it so warnings don't occur when running the test suite again).