Revert "Remove helm, set up flx-ido"

This reverts commit ef332b69c57bbd71914d8acf31f45f6f2a8af170.

Conflicts:
	emacs.d/init.el