[spacemacs] merge new template changes
[~bandali/configs] / git / .gitconfig
2014-10-25 Amin Bandaliadd bspwm, sxhkd, conky, git, gtk and x configs