Update vimrc and tmuxconf
Update vimrc, add Vundle and remove unused lines
Reorder vimrc to make more sense