Merge pull request #5 from adamhenson/master

Let users display an image as a message
enabled user to paste in links as plain text and converted to html link