edit keymaps

 * replace ctrlp
add vim plugin neocomplete
Merge remote-tracking branch 'origin/master'