Merge pull request #1389 from sarken/issue_3780

3780 Close a div tag on the splash page
3811 Header not showing in IE7
Merge pull request #1392 from sarken/issue_3811

3811 Header not showing in IE7
Merge branch 'refs/heads/master' into 0.9.11-issue-3748-pagination-tag-comments-weird-charas
Adds tests for 3748

Also fixes a little more of the redirect after commenting. >.> Found thanks to tests. :D
Merge branch 'refs/heads/master' into fiddling-deprecation-warning-emails
Test does not mean staging which we call test
Merge branch 'issue_3792' of https://github.com/zz9pzza/otwarchive into issue_3792
Merge pull request #1393 from zz9pzza/issue_3792

Issue 3792
Secluding the bookmark features in their own directory
 Issue 3803: Show more AdminPosts on home page
Adding a Factory for AdminPosts and adding a Scenario
Pluralizing variable
Fixing a typo and updating tests
Merge pull request #1113 from scottsds/issue_3419

Issue 3149: Non collection users cannot see prompts
Merge pull request #9 from CristinaRO/0.9.11-issue_1652-Scott

0.9.11 issue 1652 scott
3379 with user-inputted text escaping container
3379 add it to all userstuff, even non-paragraphs, because the parser can be funny
Rebase and tweak the whitespace on pre a bit to make wrapping nicer
Taking that back out, since I am recalling a reason I didn't use it and it doesn't really make much difference