vim
Merge branch 'vim' of github.com:hell0again/oreore_rc into vim

Conflicts:
	init_sub.sh