Merged branch from another server (by hand because of very different versions).
Merge branch 'master' of github.com:thaibault/installArchLinux