Fix for cyclone.py grid generator
2field upgrade: new names & external Phi0 field
Merge branch 'master' of git://github.com/bendudson/BOUT