Add flx-ido to the list of default packages
Merge remote-tracking branch 'origin/master' into dev
flx-ido does not exist but flx does

I had to change flx-ido to flx to avoid the following:

error: Package `flx-ido' is not available for installation
Merge pull request #357 from localredhead/master

flx-ido does not exist but flx does
Merge remote-tracking branch 'origin/master' into dev
Fix a typo
Merge remote-tracking branch 'origin/master' into dev