More flexible to set font
improve Neobundle tern
add key mapping of Git merge