Updated/Trimmed down vimrc