Fix the return type of escape to Markup

This patch fixes the return type of escape to always be Markup. It
addresses the issue with custom class that implements the __html__
method - see issue #68. A new test case, test_escape_return_type, is
added to test the behavior.
3 files changed