Merge branch 'nonlocal_test' of github.com:NREL/alfalfa into nonlocal… #1371

Job	Run time
Run integration tests with historian	16m 27s
Run simulation tests in worker	6m 17s
Run integration tests	16m 22s
Pre-commit checks	37s
Run unit tests	1m 34s
publish	24s
	41m 41s

Provide feedback