Added `v` to switch between Foreman environments
Merge master onto mac