Merge iMac and MBP dot files