Image and link methods

Depends on #627.
So is this a bug fix, then? Previously, we were wrapping them in P tags?