changed binding for ultisnips
Merge branches 'master' and 'master' of github.com:danielspector/dotfiles
ctrl-p and remappings
fix merge in vimrc
update vim alias