git pre-commit loads branches and words from file

fixes #2
fixes #3
Merge branch 'master' of https://github.com/olorton/dotfiles

Conflicts:
	git/hooks/pre-commit