Updated vimrc
Merge branch 'master' of https://github.com/wbonack/vim-setup
Add tmux.conf