simpler Terminal dir naming
bash_profile: optional $MAP in $CDPATH
Merge branch 'master' of github.com:Roman2K/dotfiles

Conflicts:
	Terminal.app-settings/hybrid.terminal
	Terminal.app-settings/hybrid.vim.terminal
	Terminal/hybrid.terminal
	bash_profile