1.7 git doesn't like the push parameter.
Merge branch 'master' of github.com:adimit/config

Conflicts:
	gitconfig
Add gutter indicators for BOF and EOF.