updates

- use splice for git merges

- various updates to .vimrc