set merge tool
added settings and manage neobundle
addd some options and plugins to vimrc
retabed gitconfig
added vim fold marker to zshrc
modified ls alias