missed a couple!

Signed-off-by: shalott <shalott@gmail.com>
Merge branch 'master' into deploy
Issue 3744 - Fixes capitlization of uses of Tos and Faq to TOS and FAQ
Fun With Caching! Adds caching to the test environment

Adjusts some cukes so they don't error while we try to find the time to fix the underlying cache invalidation bugs.
Hey, did you know automated testing is cool?

Thanks to having a way to test it, I found the proper way to expire controller caches, so guest kudos show up immediately!

Bad news, however, are that there's no clean way to expire the cache for kudos when the pseud used on the kudo has changed, whether by being replaced with a new default pseud because of pseud deletion, or by being removed entirely due to user account deletion.
Fixing two measly specs
Oh FFS Travis! "It works on my machine" is all I can say
And this is why you don't push code at 3 am
fixed the ? mark
Merge remote-tracking branch 'origin/3713' into 3713

Conflicts:
	app/views/external_authors/claim.html.erb
removed extra i picked up from merge during push to resolv conflicts
3870 Tidy up admin settings page
3870 Not validating due to omitted li tag in admin header
Begin work on improving the User Delete feature tests.
3447 series and bookmarks links missing background
Undo the logic tweaking I did because I broke it
Merge branch 'issue_3421' of github.com:sarken/otwarchive into issue_3782
Merge branch 'master' into deploy
3819 Confirm messages for work and chapter deletion
3817 Move and comment function for JS deletion