include .bash_profile_local and .bashrc if they exist
tmux
'cds' command
Merge branch 'master' of https://github.com/numegil/dotfiles

Conflicts:
	.bash_profile