modified .tmux.conf file
modified .bashrc .emacs.el
merged