Merge remote branch 'upstream/master'

* upstream/master:
  These should go into other gitignores, like Vim.gitignore
  Added Wordpress (Forgot to 'git add .')
  Added Vim >= 7.3 persistent undo files
  Added few files to OSX.gitignore

Conflicts:
	Global/OSX.gitignore

Global/vim.gitignore

 .*.sw[a-z]
+*.un~

Wordpress.gitignore

+.htaccess
+wp-config.php
+wp-content/uploads/