README: Clarify that it doesn’t matter where the repository is cloned, and document ~/.extra
README: Tweak the part about ~/.extra
.bash_prompt: Add screenshot URL
.bash_profile: Be sure to source `.bash_prompt` first, in case it sets the PATH and subsequent dotfiles rely on it
.aliases: Use `sudo` to empty local trash as well
nerfing .vimrc's setrelativenumber and undodir options in case of older vim version
added *.pyc to .gitignore
changed title in the readme to have my name
added ssh tunnel function
my dropbox folder, the default
using mathiasbynens prompt
Merge branch 'master' of https://github.com/paulirish/dotfiles

* 'master' of https://github.com/paulirish/dotfiles:
  symlink for subl
Merge branch 'mathias' of https://github.com/paulirish/dotfiles

# By Mathias Bynens (5) and Paul Irish (1)
# Via Paul Irish
* 'mathias' of https://github.com/paulirish/dotfiles:
  nerfing .vimrc's setrelativenumber and undodir options in case of older vim version
  .aliases: Use `sudo` to empty local trash as well
  .bash_profile: Be sure to source `.bash_prompt` first, in case it sets the PATH and subsequent dotfiles rely on it
  .bash_prompt: Add screenshot URL
  README: Tweak the part about ~/.extra
  README: Clarify that it doesn’t matter where the repository is cloned, and document ~/.extra

Conflicts:
	README.md
Merge branch 'master' of https://github.com/paulirish/dotfiles

# By Paul Irish
# Via Paul Irish
* 'master' of https://github.com/paulirish/dotfiles:
  update hostname
  whitespace

Conflicts:
	.bash_prompt
Merge branch 'master' of https://github.com/paulirish/dotfiles

# By Paul Irish
# Via Paul Irish
* 'master' of https://github.com/paulirish/dotfiles:
  kill mathias terminal edits.
  thx for educationg me on .inputrc, mathias.
  readme refix
  .
  edited down the .osx file to my liking.
  ...
  you should do jshintrc and editorconfig.
  updating readme with overview of dotfiles.
  syntax highlighting for these dotfiles in st2.
  hot copy w/ progress from gf3.
  some docs on my PATH setup.
  updating .aliases against mathias'.
  ack configuration courtesy of @gf3. thx
  updating gitignore with .pyc
  my edits to .brew.
  file from mathia's repo. .brew to setup homebrew install. initial import.
  update .osx to be mathias's latest. sry i didnt pull git history or anything rad like that.
  new file : install-deps. Setup of environmenty things I need.
  the term bootstrap these days means sumpthin else. soooooo lets change this filename.

Conflicts:
	.aliases
	.gitignore
	readme.md
Merge branch 'master' of https://github.com/paulirish/dotfiles

* 'master' of https://github.com/paulirish/dotfiles:
  install dotfiles syntax highlighting via package control instead of editing core files
  spotifycontrol
  sound tweaks in .osx. no translucent dock icons.
  official cli tools ftw
  =)
  Any GitHub repo with my username should be checked out r/w by default. thx @jamiew
improves emptrytrash to clear system logs
I prefer subl
Merge branch 'master' of https://github.com/paulirish/dotfiles

* 'master' of https://github.com/paulirish/dotfiles:
  .osx: Allow installing user scripts via GitHub or gists
  only show user/host for not my machine.
  hosts alias for editing hosts quickly.
  i think i like this 2D dock...
want it to be me.