Merge vimrc
Update 'pmux' script
Add a bunch of snippets