Ubuntu fixes
...
Merge branch 'master' of https://github.com/gpapadopg/chef-mailcatcher