Improvements to comment embedding

Conflicts:
	applications/vanilla/controllers/class.discussioncontroller.php