Disable p4 for vcs_info -- it takes for friggin ever
Clear out accidentally added local settings in env.local

Conflicts:

	env.local
Add import_cacert zsh function
Fix some [ -> [[
120 char textwidth
Java additions
Add setup_android function
Fix zsh function and module loading
Don't load oh-my-zsh
Merge branch 'master' into darwin