restore a couple lost changes, comment out 2 debug error log calls
restore a couple lost changes, comment out 2 debug error log calls

charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal