Make changes and such...
Merge branch 'master' of https://github.com/arecarn/vimfiles

Conflicts:
	vimrc
Merge branch 'master' of https://github.com/arecarn/vimfiles
Correct setup script

use vimrc vs .vimrc inside script