backup 130719
Merge branch 'master' of https://github.com/TaizoAyase/configs

Conflicts:
	.vim/bundle/.neobundle/install_info