catchup parallel cluster files
Merge branch 'master' of github.com:jonnyjohannes/qmmm

Conflicts:
	swm4/inputs/toppar.charmm.str
	swm4/pbs/submit.pbs
	swm4/pbs/submit.template.pbs
	swm4/pbs/submitpbs.py
	tip3/inputs/mini.charmm.inp
	tip3/pbs/submit.pbs
	tip3/pbs/submit.template.pbs
	tip3/pbs/submitpbs.py