Fix hook handling
Merge branch 'hooks' of github.com:RocknRoot/Cylon into hooks

Conflicts:
	cylon/__main__.py