add aliases && disable the terminal lock of Ctrl-S
Merge conflicts by '.gitconfig'
add nmaps for test, match pairs, some NeoBundles