Merge branch 'submoduleupdate'
Update submodules
Merge branch 'submoduleupdate'
Change defaults; colorscheme; filetype
Update submodules
Merge branch 'master' into submoduleupdate