Update config to handle new dotfiles
Merge branch 'develop' of github.com:skarfacegc/dotfiles into develop

Conflicts:
	dotfiles.conf
Merge branch 'master' into develop