Brewfile: Install BFG Repo-Cleaner
.curlrc: Set connection timeout to 60 seconds

This matches the setting in `.wgetrc`.
Remove some things that I don’t use

This commit drops some aliases, functions, and settings from the project that I wasn’t using at all. It also cleans up some of the remaining code.
Caskfile: Update Tor formula name

Closes #388.
.gitconfig: Improve configuration

Closes #366.
.osx: Add (commented-out) instructions on how to set the wallpaper

Closes #356.
.osx: Only install custom Terminal profile once

Closes #336 and #337.
.screenrc: Add some more settings

Closes #334.
.osx: Disable the Launchpad gesture

Closes #316.
Brewfile: Install a more recent version of `screen`

Closes #295.
.bash_profile: Enable Bash completion if `/etc/bash_completion` exists too

This is useful on Linux.

Ref. #278.
Update Bash prompt to match the Solarized theme

Screenshot: http://i.imgur.com/EkEtphC.png
Enable Solarized Dark theme in Vim
.gitconfig: Remove `push.default`

This was causing issues on servers that don’t have an up-to-date Git installation. As a workaround, I decided to remove this from `.gitconfig` and add this to `~/.extra` for my laptop only:

    git config --global push.default simple
.gitconfig: Tweak `diff` colors
init: Use the Solarized Dark theme in Sublime Text
.gitconfig: Add default Git `push.default` config

Use the backwards-compatible `matching` setting by default. On machines with newer Git installations, it avoids the annoying Git warning, and it can be overriden to use `simple` instead in `~/.extra`.

Closes #400.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .gitconfig: Add default Git `push.default` config
  init: Use the Solarized Dark theme in Sublime Text
  .gitconfig: Tweak `diff` colors
  .gitconfig: Remove `push.default`
  Enable Solarized Dark theme in Vim
  Update Bash prompt to match the Solarized theme
  .bash_profile: Enable Bash completion if `/etc/bash_completion` exists too
  Brewfile: Install a more recent version of `screen`
  .osx: Disable the Launchpad gesture
  .screenrc: Add some more settings
  .osx: Only install custom Terminal profile once
  .osx: Add (commented-out) instructions on how to set the wallpaper
  .gitconfig: Improve configuration
  Caskfile: Update Tor formula name
  Remove some things that I don’t use
  .curlrc: Set connection timeout to 60 seconds
  Brewfile: Install BFG Repo-Cleaner

Conflicts:
	.bash_prompt
	.gitconfig
	.osx
	Brewfile
	Caskfile
	bootstrap.sh
	init/Mathias.itermcolors
	init/Preferences.sublime-settings
	init/Solarized Dark.itermcolors
	init/Tom.itermcolors
	init/Tom.terminal
Added Kaleidoscope as mergetool