Add DOTFILES env variable and standardize BASH/ZSH paths

Conflicts:
	bashrc
	config/awesome/theme.lua
	fehbg
	xbindkeysrc
	xinitrc
	zshrc
Add merge summary and colors to gitconfig

Conflicts:
	gitconfig
Add function to sync dotfiles quickly between branches