Merge branch 'drop-redcarpet' of github.com:github/gollum into drop-redcarpet
Add tests for escaped characters in title
Escape names on page create redirect
syntax highlight should with utf-8
allow ftp and irc protocol links in wiki pages
Make default markup changeable through sinatra settings
remove contents of script and style elements

Avoids rendering HTML-ized CSS and/or Javascript by removing the
contents of script and style elements as well as the elements
themselves.

/cc @technoweenie

Pull Request: master
Added test for ASCII characters in code blocks created with back ticks.
Fix searchbar position and button appearance
Serve Gravatars via SSL.
Merge pull request #283 from dentarg/master

Serve Gravatars via SSL
Merge remote-tracking branch 'origin/master' into xdite-merge

Conflicts:
	lib/gollum/markup.rb
minor api updates
Merge pull request #264 from github/remove_contents

remove contents of script and style elements
Merge pull request #273 from polarblau/code_block_ascii_bug

Added test for ASCII characters in code blocks created with back ticks.
Merge remote-tracking branch 'xdite/highlight-utf8'
Merge branch 'master' into code_with_multibyte

Conflicts:
	lib/gollum/markup.rb
	test/test_markup.rb
update the gemspec to reflect mathjax being gone
Remove MathJax.
Merge pull request #166 from arr2036/mediawiki_compat

Gollum doesn't play nice with un-canonicalized filenames, and breaks offsite links when replacing mediawiki