Fixed a couple of minor script errors
Merge branch 'master' of https://github.com/greg0ire/git_template
Junk checker hook added
Updated readme with junk checker
Merge remote-tracking branch 'remotes/greg0ire/master'

Conflicts:
	hooks/post-merge
Moved junkchecker hook to hooks root dir and changed to /bin/bash
stray exit bugfix
Tidy + renamed junk-phrases.sample to default to disabled
Merge pull request #2 from gezpage/master

Junk Checker hook