remove pmag2.py, put function into pmag.py
Merge branch 'master' of github.com:ltauxe/PmagPy