Move wiki app.
Merge branch 'master' into move-wiki
Merge branch 'master' into move-wiki
Merge branch 'master' into move-wiki
Merge branch 'master' into move-wiki
fix bug 775485 - welcome email tweaks
Fix Travis config after merge conflict.
Merge pull request #2607 from groovecoder/change-welcome-email-from-775485

fix bug 775485 - welcome email tweaks
Merge branch 'master' into move-wiki
Fix a stray import.
Vertically center icons on homepage maps
Fix minor annoyances with login widget
Use $ for variable in content.styl
Merge pull request #2626 from darkwing/fix-table-blue

Use $ for variable in content.styl
Merge pull request #2623 from darkwing/login-widget-minor-fixes

Fix minor annoyances with login widget
Merge pull request #2621 from darkwing/homepage-icon-alignment

Vertically center icons on homepage maps
Delete "The Basics of HTML" link.

Please delete the "The Basics of HTML" link as the link is broken and is causing a 404 error.
Reverted some accidental changes done in c5f827baf3b9dc3db949ff768bae4f8fc374f10b that broke some admin templates.
Merge pull request #6 from jezdez/move-wiki-admin-templates-fixes

Reverted some accidental changes done in c5f827baf3b9dc3db949ff768bae4f8...
Stop Scunthorpe problem that affects a poor user named forumszosa.

This removes an old httaccess rules for /forums. Fix bug #1015590.