merge vimrc changes from amix, mac os changes, and vim-rails fixes