add change
Merge branch 'master' of github.com:omoresec/dotfiles

Conflicts:
	_bashrc
	_vim/bundle/nerdtree
	_vim/bundle/powerline
	_vim/bundle/tcomment_vim
	_vim/bundle/tlib_vim
	_vim/bundle/vim-snipmate
	_vim/bundle/vim-snippets
	_vimrc