Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .osx: Comment computer name settings
  .osx: Remove “disable opening and closing window animations”
  .osx: Change minimize/maximize window effect
  .osx: Allow installing Chrome user scripts via GitHub Gist or Userscripts.org

Conflicts:
	.osx