Use base 'eclipse' folder as base for eclim.
Remove specialized eclipse and vm workspaces from xmonad.
Merge branch 'master' of github.com:peplin/dotfiles
Add highlighting in vim for protobufs.
Merge branch 'master' of github.com:peplin/dotfiles
Temporarily work around glog dying.
Update config for vim-notes.
Decrease timeout for git in prompt.
Merge branch 'master' of github.com:peplin/dotfiles
Update ackrc for latest version, use smart-case.
Remove unused package from PYTHONPATH.
Enable the Git in-memory credential cache.
Revert "Decrease timeout for git in prompt."

This reverts commit 294f327dbf9783bd7f3b46eac5b584818c5510a6.
Merge branch 'master' of github.com:peplin/dotfiles
Merge remote-tracking branch 'origin/master' into osx

Conflicts:
	python/env.zsh