Lots more changes, all going towards the new graphing interface goal
Merge branch 'dev' of https://github.com/pmlrsg/GISportal into dev

Conflicts:
	build.py