Fix locale in Lion and add rvm to path
Commiting local changes to .zshrc
Merge branch 'master' of https://github.com/bond/dotfiles

Moved my rvm-stuff to ~/.zshrc.local

Conflicts:
	dot.zshrc
Fix emacs for mac.
Merge branch 'master' of https://github.com/bond/dotfiles