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

Conflicts:
	lib/whale