updated conversions
Merge branch 'master' of https://github.com/terryrankine/scripting

Conflicts:
	netcdf-ga/convert.py