fixed hunker and conf so that it's smarter
Merge branch 'master' into ubuntu
ubuntu fix