ignoring pyc
Merge branch 'harney-devel' of https://github.com/jfharney/DiagnosticsViewer into harney-devel

Conflicts:
	django-app/uvcdat_live/exploratory_analysis/urls.pyc
	django-app/uvcdat_live/exploratory_analysis/views.pyc
updated paths for my machine… woo
added Brian's code
setting up ajax call
ajax call implemented and front end connected
Fixed paths for local execution
Merge branch 'jewell-devel' of github.com:jfharney/DiagnosticsViewer into jewell-devel

Conflicts:
	django-app/uvcdat_live/exploratory_analysis/paths/paths.py
	django-app/uvcdat_live/exploratory_analysis/paths/paths.pyc
	django-app/uvcdat_live/exploratory_analysis/views.py
parseint
Merge branch 'jewell-devel' of github.com:jfharney/DiagnosticsViewer into jewell-devel
Merge branch 'jewell-devel' into harney-devel-jewellintegration

Conflicts:
	django-app/uvcdat_live/exploratory_analysis/paths/paths.py
	django-app/uvcdat_live/exploratory_analysis/paths/paths.pyc
	django-app/uvcdat_live/exploratory_analysis/urls.pyc
	django-app/uvcdat_live/exploratory_analysis/views.py
	django-app/uvcdat_live/exploratory_analysis/views.pyc
Slight change to the link for diagnostic tree viewer
WIP: Figure saving
heatmap added to repo
Added a "core.js" file to isolate all of the hard coded values/constants
Changed the hard coded values to constants in the core js file
Added cached images
Some changes in pointers to js and css files

Heatmaps use a different version of d3 and the style css in treex
misc
Merge branch 'harney-devel-figuresave' into harney-devel-jewellintegration

Conflicts:
	django-app/uvcdat_live/exploratory_analysis/models.pyc
	django-app/uvcdat_live/exploratory_analysis/urls.pyc
	django-app/uvcdat_live/exploratory_analysis/views.pyc