Merge branch 'nkchanges' into 'master'

Disable modelines as we use securemodelines plugin

See merge request !6

vimrc

@@ -93,10 +93,11 @@ set ignorecase
 set showmatch
 
 
+"NK: We now use secure modelines plugin, so this should be disabled by default
 " Pull vim settings from end of file
-set modeline
+"set modeline
 " Use 3 lines at bottom of file
-set modelines=3
+"set modelines=3
 
 " Only support unix filetypes
 set fileformats=unix