git module cleanup
zshrc updates for new MBP setup
vimrc updates, adds soy and proto syntax highlighting
fix merge conflicts