Replace command-t with cntrlp
Merge branch 'master' of github.com:hrother/dotfiles