merge in changes from marvinroger
add option for unfurling links