git and screen settings
git and ack settings

Conflicts:
	.gitconfig