Manually combined bridge and c-home into Master

Must have borked merging.  I manually combined each file to get
everything working correctly.