Merge pull request #1 from JorgenEvens/hooks-location

Allow for hooks to be installed anywhere.
fix merge conflict
add contributor
add line break
make list of contributors
Merge remote-tracking branch 'upstream/master'