syncing with hpcc
Merge branch 'master' of github.com:emilydolson/ChangingEnvironmentGA

Conflicts:
	vector_config.ini