win7 desktop setting
fix merge conflicts
Merge branch 'master' of https://github.com/dalang/eddie-vim

Conflicts:
	vimrc
edit vimrc for diff OS
Merge branch 'master' of https://github.com/dalang/eddie-vim

Conflicts:
	.gitmodules
	vimrc