Minor formatting fixes and removed some workarounds for DRMAA that shouldn't be necessary with my latest forked version.