Update for Ubuntu 13.10
Merge branch 'master' of github.com:rhannequin/upgrade-ubuntu