Build system improvments.
Update supported file types on the Mac.
FIXED: Paragraphs not always focused properly when merged.