Merge pull request #89 from alerque/master

Add hooks to allow fancy merge handling