Merge erb.rb and markdown.rb into tilt.rb