updates from laptop
Merge branch 'master' of github.com:kerinin/environment

Conflicts:
	.profile_shared