Numpy module renames.
Merge pull request #30 from bjlittle/numpy_tidy

Numpy module renames.