branch logically rebased on the basis of forkpoint on master
Merge branch 'personal' of github.com:jaybh/config_files into personal

Conflicts:
	.gitconfig