Update nwchem branch with some developments

The branch isn't ready to merge into master, but I want to get it to that point soon...