Fix type. WHALE_CONF -> $WHALE_CONF
Merge branch 'savi-2.0' of https://github.com/savi-dev/devstack into savi-2.0

Conflicts:
	lib/whale