Port to new system
Merge branch 'master' of github.com:bartv/imp-ubuntu