Merge branch 'master' of https://github.com/mathiasbynens/dotfiles

* 'master' of https://github.com/mathiasbynens/dotfiles: (35 commits)
  .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
  bootstrap.sh: Make `rsync` output numbers in a human-readable format
  Brewfile: Install Node with npm
  Brewfile: add instructions on how to change the default shell to Bash 4
  ...

Conflicts:
	.bash_profile
	.bash_prompt
	.bashrc
	.cask
	.curlrc
	.functions
	.gitconfig
	.gvimrc
	.screenrc
	Brewfile
	bootstrap.sh
	init/Preferences.sublime-settings
Merge branch 'master' of github.com:bryantebeek/dotfiles

* 'master' of github.com:bryantebeek/dotfiles: