Add some Debian tweaks
Merge branch 'master' into debian