Updated Sublime 3 dev
Merge branch 'master' of github.com:lipis/dotfiles

* 'master' of github.com:lipis/dotfiles:
  Git push default set to simple
  Minor
  Added hg merge settings
  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
  Added TeamViewer