Add improved folder completion.
Decrease the switch timeout for vimode.
Minor cleanup.