diff --git a/.vimrc b/.vimrc
index 48bf24a..ed8453e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,99 +1,54 @@
-scriptencoding utf-8
-set encoding=utf-8
+" Requires git and https://github.com/junegunn/vim-plug
+" Run :PlugInstall on set up
 
-" get out of VI's compatible mode..
-set nocompatible
+call plug#begin('~/.vim/plugged')
 
-" sets how many lines of history VIM has to remember
-set history=400
+Plug 'tpope/vim-sensible'
+Plug 'tpope/vim-fugitive'
+Plug 'nanotech/jellybeans.vim'
+Plug 'sbdchd/neoformat'
+" Plug 'mattn/emmet-vim'
+" Plug '~/.fzf'
+" Plug 'lepture/vim-jinja'
+" Plug 'will133/vim-dirdiff'
 
-" set to auto read when a file is changed from the outside
-set autoread
+" Common commands:
+" PlugInstall [name] - install plugins
+" PlugUpdate [name] - update plugin
+" PlugClean - remove unused plugins
+" PlugUpgrade - upgrade plug
 
-" have the mouse enabled all the time:
-set mouse=a
+call plug#end()
 
-" show cursor position
-set ruler
+" most default settings are loaded by vim-sensible above
 
-" the commandbar is 1 high
-set cmdheight=1
-
-" set backspace
-set backspace=eol,start,indent
-
-" backspace and cursor keys wrap to
-"set whichwrap+=<,>,h,l
+" custom colours
+colorscheme jellybeans
 
 " ignore case when searching
 set ignorecase
-set incsearch
-
-" set magic on
-set magic
 
 " allow highlighting search words
 set hlsearch
 
-" tab size is 4 spaces
-set ts=4
+" tab size is 2 spaces
+set ts=2
 
-" indent is 4 spaces
-set shiftwidth=4
+" indent is 2 spaces
+set shiftwidth=2
 
+" tab becomes spaces
 set expandtab
 
-" default font
-" set guifont=DejaVu\ Sans\ Mono\ 9
-
 " show line numbers
 set number
-" set relativenumber
-
-" automatically indent on line break
-set autoindent
-
-" automatically fold on indents
-" set foldmethod=indent
-
-" set colors to 256 for terminal VIM
-set t_Co=256
-
-" dark background
-set background=dark
-
-" nyummy wombat colours
-" colorscheme wombat
-
-" enable plugins
-filetype plugin on
-
-" highlight syntax
-syntax on
 
 " allow a 7-line verticle buffer for the cursor
 set so=7
 
 " turn backup off
 set nobackup
-set nowb
-set noswapfile
-
-" auto indent
-set ai
-
-" smart indet
-set si
-
-" wrap lines
-set wrap
-
-" break wrap at words
-set lbr
 
-" show whitespace
-if has("patch-7.4.710")
-    set listchars=eol:¬,tab:>-,trail:~,extends:>,precedes:<,space:·
-else
-    set listchars=eol:¬,tab:>-,trail:~,extends:>,precedes:<
-endif
+" set listchars=space:·,tab:»·,trail:¬
+" set syntax=whitespace
+set list