Update default chpl_home based on Thomas' feedback