gaussian.py: required for gaussian to work on pharos
Merge remote-tracking branch 'upstream/master'
Getting the updates
PM6 and PM7 options are added for MOPAC. Usage software=MOPACPM6, etc.
Revert "gaussian.py: required for gaussian to work on pharos"

This reverts commit 7c68b07f07c96790061d7d57ef8e9b9ca2465577.
Trying to avoid sleep solution for AttributeError in cclib object
resolving conflicts to merge with master
Reverting a mistake I did during the merge with master