merged
Added replace script
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/vimrc.symlink
pointer to neobundle submodule