git sync
work: troll
vim ejs syntax group
Merge branch 'master' of github.com:chpatton013/dotfiles

Conflicts:
	vim/vimrc