Merged NEI module, bumped version