Temporarily commented out auto complete and erc emacs bits and some
random cleanups.