concluding merge
yasnippet changes and loadpaths