Add an option for concise keybindings

Conflicts:
	neotree.el