improved setup script, minor differences to resolve
Merge branch 'master' of http://github.com/finbarrocallaghan/dotfiles

Conflicts:
	vim_setup.sh