Merge branch 'dev'
Merge branch 'dev'

Merged in portability bugfix for build scripts.
Renamed hooks according to debian manual standards
Fixed missing arch detection in auto/config
Merge branch 'master' into dev
Fixed Unintentional output from 'which'