Adding limelit and goyo.
Fixing merge conflict.