Add new modules and updated others
Update vimrc to latest from macbook