Removed old stuff that accidentally got added in during the merge and fixed dependencies. NEI support turned back on.