Revert "Fix project specification on PBS Pro for #363. Hello #372! ;-)"

This reverts commit 717f0c8b4d54cf773fabc96cf968698aeeaa6318.

Unfortunately, there is (widespread) mixing of -A and -P in PBS Pro land, and
this needs more thought.
Be gone!
Another attempt at #376.
Merge branch 'devel' into feature/bgq