Work on color coding by string variables
Merge branch 'master' into pim-strings
Working on color coding by string variables
Update docker images.
Merge branch 'master' into pim-strings
Updating table colormap after values have changed
Only updating table colormap if value changed in currently selected column
Wrapping up work on switching color variables between numeric and string
Refactoring color scale code to make distinction between color maps and color scales more clear.
Merge branch 'master' into pim-strings
Update install.rst
More refactoring to distinguish between colormaps and colorscales
Fixing problem with initial load of colorscales
Merge branch 'master' into pim-strings
Merge branch 'master' of https://github.com/sandialabs/slycat
Allowing for PIM models with no image columns. Closes #169
Merge branch 'master' into pim-strings
Updating CSS to only display pin button when image is in preview mode. Fixes #248
Merge branch 'master' into angular-model

Conflicts:
	docker/slycat/config.ini