Py3k fixes
python2 fixes. sigh.
Merge pull request #354 from wiredfool/test_numpy

Py3 fixes