Many changes
Conflicts:
	vimrc
Fixed confilict in vimrc
Merge branch 'master' of https://github.com/git-man/dotvim
Merge branch 'master' of https://github.com/git-man/dotvim