Change gitignore
Merge branch 'master' of github.com:muratas/dotfiles

Conflicts:
	.vim/bundle/.neobundle/doc/tags
	.vim/bundle/.neobundle/install_info