Re-updated HM-CMB

Re-syncing to master for HM-CMB