the usual trivial changes
Merge branch 'devel' of github.com:UV-CDAT/uvcmetrics into devel

Conflicts: (fixed)
	src/python/frontend/batch.py