...
Merge branch 'master' of github.com:jldailey/dotfiles

Conflicts:
	.vim/bundle/vim-coffee-script
...