Add phpstorm project data directory to ignores.
Swap out environment_indicator for which_environment in base makefile.
Enable which_environment on deploy to test.
Add example  setting for which_environment.
Merge branch 'task--environment-indicator-replacement' into 7.x