Merge branch 'master' into arch
Fix installing X session
Use Terminator as terminal