save local changes for merge
merge
24.4 doesnt want root in load path
fiddling with submodules
remove tagedit, readding it
add snippets