updated submodules
Merge branch 'master' of github.com:zpao/dotfiles
Merge branch 'master' of github.com:zpao/dotfiles

Conflicts:
	vim/vim.symlink/bundle/delimitMate
	vim/vim.symlink/bundle/nerdtree
	vim/vim.symlink/bundle/supertab
	vim/vim.symlink/bundle/syntastic
	vim/vim.symlink/bundle/tComment
	vim/vim.symlink/bundle/vim-fugitive
	vim/vim.symlink/bundle/vim-rails
powerline > vim-powerline
remove vim-powerline
more vim bundles, update existing
update homebrew pacakges
https://github.com/bilalq/lite-dfm
http -> git in gitmodules
vim-jsx
Merge branch 'master' of github.com:zpao/dotfiles
no more submodules

pathogen is going away, switching to neobundle
NeoBundle
flatlandia