Add ~/.dotfiles/zsh/scripts and rvm to path
These words are cromulent
Merge branch 'master' of github.com:nathanl/.dotfiles
Meta-cromulent
Merge branch 'master' of github.com:nathanl/.dotfiles

Conflicts:
	vim/bundle/nathan/endwise/spell/en.utf-8.add
	vim/bundle/nathan/endwise/spell/en.utf-8.add.spl
highlighting hamlc
Merge branch 'master' of github.com:nathanl/.dotfiles
routable is a word
Replace PeepOpen and FuzzyFinder with CtrlP
Have CtrlP take over its predecessors' keybindings
CtrlP default to regexp. (Nice for exact matches.)
Let Michael comment stuff out too
Beleted function
minus muscle memory mappings
Merge branch 'master' of github.com:nathanl/.dotfiles
CtrlP: don't use regexp mode by default
Make tmux use 256 colors
More tmux configuration