Update
Merge branch 'master' of github.com:muniere/config

Conflicts:
	conf/macos/.shrc.macos