rust and elm
Merge branch 'master' of github.com:seantalts/dotfiles

Conflicts:
	_vimrc