Fix Issue #184 and Issue #186
Merge branch 'master' into ergoemacs-theme
More basic keymaps returned from ergoemacs-theme-component-keymaps
Fix the order of the keymaps returned.
Made hook keymaps.
Turn on keys from new ergoemacs-theme engine.
Use delq and remove space.