More options merged from ryankanno/vim-config.