Fix the erubis auto escape faq bit.
Merge pull request #101 from bemurphy/fix_erb_faq

Fix the erubis auto escape faq bit.
Merge branch '1.4.x'
Merge branch 'master' of github.com:sinatra/sinatra.github.com
1.4.1 has been released
1.4.2 released
Update bind docs in configuration.markdown

The default value for `:bind` has changed in development (see
sinatra/sinatra@0f9a959253bdf0c39422ffb9b60278df46ef0248).

Update configuration docs to account for new defaults.
Correct the Rack SPEC URL.
Merge pull request #106 from frankshearar/fix-rack-spec-url

Correct the Rack SPEC URL.
Added scrumprimer.org and Odd-e as Sinatra in the wild uses.
improve auth code in faq
improve auth code in faq
improve session example
Merge pull request #107 from basvodde/master

Added a site and a company to the wild sinatra list
Keep linkblocker filename in all examples in extensions.markdown.
Merge pull request #108 from simi/patch-1

Keep linkblocker filename in all examples in extensions.markdown.
Merge pull request #104 from mattwildig/bind_conf_docs

Update bind docs in configuration.markdown
update the README, Japanese and German README links to link to the new markdown files
Merge pull request #109 from brettchalupa/bc/fix_broken_links

update the README, Japanese and German README links to link to the new markdown files
Add Digital Deployment to Sinatra in The Wild page