Removed git integration from shell.
Merge branch 'master' of https://github.com/andreasrs/configs

Conflicts:
	X/.Xresources
Merge branch 'master' of https://github.com/andreasrs/configs
Borders and fonts