Merge two pbsipcluster versions

@skearnes