Make grizzly the default for master branch

This will end up dropping the 'always_use_volumes' flag from nova since the patch is only against folsom, but we can sort that out later since there's lots of other benefits from grizzly in general