Merge two pbsipcluster versions

@sklearns