5 Commits

Author	SHA1	Message	Date
Rob L	226917bf22	Merge with master branch maybe	2016-07-22 10:49:42 -04:00
Rob L	e37d3fef2f	Remove mapview in prep for subtree merge	2016-07-22 10:45:53 -04:00
Rob L	14ea3776c8	Add dataloading back	2016-07-07 12:49:32 -04:00
roblevesque	1ebee3c8e5	Run JSON through validation to ensure correctness	2016-07-07 11:32:09 -04:00
Rob L	47da08343c	Really add the master project files this time	2016-07-07 11:18:02 -04:00