Smaller changes
Merge branch 'master' of https://github.com/ptycho/ptypy