merginc change
Merge branch 'master' of github.com:everett1992/dotfiles

Conflicts:
	vim/after/ftplugin/ruby.vim
removed misspelled file