updated windows _vimrc file and composer
Merge branch 'master' of https://github.com/jimmydburr/dotfiles

Conflicts:
	bin/composer