Fixed yankring ctrlp conflict
Merge branch 'master' of github.com:taglia/dotfiles