Lots of changes to the reduced functional - none completed, just syncing for
access over the weekend
Take two of trying to commit...
Merge branch 'objectives' of github.com:funsim/OpenTidalFarm into objectives

Conflicts:
	opentidalfarm/controls.py