Latest changes to environment

Conflicts:
	.bashrc