New sublime wiki system
two-line prompt
Merge branch 'master' of github.com:rdeits/config

Conflicts:
	sublime-config/Package Control.sublime-settings
	zshrc
Put mvimdiff as mergetool