adopt diff3 conflict style
cpass updates
tweak cmdfreq
if CMVC_RELEASE is not set, grab it from git config variable
minor updates to cmvc scripts (dealing with migration)
hack different path for zsh (this should really be better)
prompt and zle stuff
add jazz scmtools to path
add more internal tools
add my old-scool replace script
add our ll grammar syntax highlighting to vim
linux screen
Merge branch 'master' of github.com:clord/dotfiles

Conflicts:
	gitconfig
	zshenv