change conditions around for loading settings
Merge branch 'master' of https://github.com/adsmit14/vimfiles

Conflicts:
	vimrc
update gitignore