update the setup with local config files
Merge branch 'master' of https://github.com/arecarn/dotfiles
push defualt to tracking, local file creation in setup
Merge branch 'master' of https://github.com/arecarn/dotfiles

Conflicts:
	setup.sh