Be consistent about spacing
Add rvm ruby version as per @i8ramin in #89
Merge branch 'master' into add-rvm-to-prompt

Conflicts:
	zsh/prompt.zsh
Merge pull request #92 from jacobwg/add-rvm-to-prompt

Display ruby version from rvm in the prompt, function-extracted
git-nuke
I just don't use `h`
Grab my real public key
Remove autocompletion for deleted `h` function
Merge pull request #104 from jacobwg/remove-h-completion

Remove autocompletion for deleted `h` function
Updated Grouper commands, added more sublime settings
Merge branch 'master' of https://github.com/nottombrown/dotfiles
updated aliases to use wget
Show me my unpushed changes
Show me my unpushed changes diffstat
Include the count, too
Added aliases
Added trailing spaces settings
Added trailing spaces settings
Merged in upstream
Removed cloudapp