refactor .vimrc
Merge branch 'master' of github.com:funnythingz/dotfile

Conflicts:
	.vim/.netrwhist
	.vim/autoload/nerdtree.vim
	.vim/bundle/.neobundle/doc/tags
	.vim/bundle/.neobundle/install_info
	.vim/bundle/.neobundle/tags_info
	.vim/colors/desert.vim
	.vim/colors/molokai.vim
	.vim/doc/NERD_tree.txt
	.vim/doc/project.txt
	.vim/neobundle.vim.git
	.vim/nerdtree_plugin/exec_menuitem.vim
	.vim/nerdtree_plugin/fs_menu.vim
	.vim/plugin/NERD_tree.vim
	.vim/plugin/nerdtree/bookmark.vim
	.vim/plugin/nerdtree/creator.vim
	.vim/plugin/nerdtree/key_map.vim
	.vim/plugin/nerdtree/menu_controller.vim
	.vim/plugin/nerdtree/menu_item.vim
	.vim/plugin/nerdtree/opener.vim
	.vim/plugin/nerdtree/path.vim
	.vim/plugin/nerdtree/tree_dir_node.vim
	.vim/plugin/nerdtree/tree_file_node.vim
	.vim/plugin/project.vim
	.vim/syntax/nerdtree.vim
	.vimrc
	.zshrc