Merge pull request #1994 from RosettaCommons/sheffler/baker_pyrosetta minor tweaks to pyrosetta build.py for build on baker systems