changes to vimrc and pandoc snippets
merge