Fix #652 - In comments with emoticons, URLs are not clickable

Fix #652 by preserving html after converting emoticons. Before & after shot below.

![emoticons](https://f.cloud.github.com/assets/3903757/1872440/37d682fc-78a6-11e3-83b2-945d26b5ba74.png)