Be consistent about spacing
Add rvm ruby version as per @i8ramin in #89
Remove todo.txt stuff
Add `todo`
Just use $*
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
Merge remote-tracking branch 'upstream/master'

Conflicts:
	system/keys.zsh
	zsh/prompt.zsh