More packages!
Merge branch 'master' into lfm-hack
Make the setup script work