Merge branch Mario/config_updates (S merge request)

Some minor tweaks to configuration settings, as suggested by Lee_Stricklin in http://forums.xonotic.org/showthread.php?tid=5155&pid=69270

Also adds .DS_Store to the ignore list (got sick of seeing a huge row of .DS_Store files in SmartGitHg on my MacBook...)