Tidied up .gitmodules and replaced vim-powerline with vim-airline
Removed SHIM