Add autoloads and remove obsolete? code
Move ergoemacs-without-emulation to ergoemacs-shortcuts