[Minor] Update for cassiopeia
Merge branch 'master' of github.com:nvasilakis/dotrc

Conflicts:
	shell/environment.sh