autocomplete re-added
org mode added, commit before branching and switch the init file to org mode