Changed paths
Merge branch 'jewell-devel' of github.com:jfharney/DiagnosticsViewer into jewell-devel

Conflicts:
	django-app/uvcdat_live/exploratory_analysis/paths/paths.py
updates for newest version of uvcdat.
Integration of new uvcmetrics
Merge branch 'uvcdat-next-required' of github.com:jfharney/DiagnosticsViewer into jewell-devel
Merge branch 'jewell-devel' of github.com:jfharney/DiagnosticsViewer into jewell-devel

Conflicts:
	django-app/uvcdat_live/exploratory_analysis/paths/paths.py
Cosmetic changes