Move neocomplete bundle change to fork, and cleanup a little