more config
Updated vimrc
Added offlineimap
added msmtp info
fixed merge conflicts