Fix tempfile "leak".

Fix a leak of tempfiles from the C2PAP module which would fail to delete
temporary files it created if an exception was raised.
Fix C2PAP after batch system interface change.

Fix the C2PAP submodule after the batch system was upgraded and the interface
has been slightly changed.
Merge pull request #21 from legordian/master

Fix tempfile "leak".