Make Civilization V floating by default
Merge branch 'master' into laptop