_vimrc and composer updates
Merge branch 'master' of git://github.com/jimmydburr/dotfiles

Conflicts:
	bin/composer
changed to vim-airline since powerline refuses to work on Windows 10
Merge branch 'master' of git://github.com/jimmydburr/dotfiles