numpifying things
Merging numpify into master.