Added .tmux.conf, and 'timeout' in vimrc
Merged local changes with master
Renamed dotfiles to .dotfiles