Updated for py3 and newer torch. Faster, easier to use

This works with python 3, and doesn't give warnings with modern pytorch (1.3). It also has a better factored easy-to-use method, and runs quite a bit faster by default.