More robust reset_env script.

Conflicts:

	bin/reset_env.sh