[fix bug 854165] Clean up some settings.
Merge pull request #955 from jsocol/settings

[fix bug 854165] Clean up some settings.
Merge pull request #953 from groovecoder/remove-webtrends

Remove webtrends
Kill the rancid green line on code samples

Because seriously what were they thinking.
Merge pull request #958 from mattbasta/patch-2

Kill the rancid green line on code samples
Slash missing in staging site link
Merge pull request #959 from klamping/patch-1

Slash missing in staging site link
fix bug 801046: Strip HTML comments from rendered wiki content
Merge pull request #960 from lmorchard/800548-strip-html-comments

fix bug 801046: Strip HTML comments from rendered wiki content
Fix bug #772950
Merge pull request #957 from iakshay/master

Fix bug #772950 - Don't show "approved" information on history pages
fix bug 764006 - Remove summary and keywords from revision diff
Merge pull request #961 from darkwing/kuma-diff-764006

fix bug 764006 - Remove summary and keywords from revision diff
First draft of Django 1.5 logging configuration.

Django 1.5 compatibility: model field definitions and arguments.

Django 1.5 compatibility: Small typo in log settings.

Django 1.5 compatibility: Stop importing log_settings since we don't use it anymore.

Django 1.5 compatibility: Fix JSON field.

Django compatibility: More model field definitions that got left out of last commit.

Django compatibility: The big one.

Django compatibility: more sumo cleanup.
Django compatibility: Fixes to account for caching and misc tweaks
more django compatibility fixes
update vendor submodule to django 1.4.5 commit
restore CSRF in templates
Changes from local testing.

Behavior of _ has changed.

Add STATIC_URL setting.

This will need to be coordinated with an Apache config change to serve
admin assets from /static/admin/.
fix rebase issue