Fix zsh completion colors
Fix mktemp call in import_cacert
Add module path to $fpath when loading
Let load_module set fpath
Prepend tmux session name to Xterm title
Reset Vim python tw and cc to 80
Add dash and funcoo to Vim bundles
Fix up mkdjango
Add .gitignore to django basic template
Merge branch 'master' into darwin

Conflicts:
	zsh/func/makers/mkdjango
	zshrc
Clean up pw()