Reorganized vimrc; Updated for compatability accross Mac and Linux.