Add gfxcardstatus
OS X defaults tweaks
Don't keep backups of merge files