fixed typos / stories references
fixed forgotten the
fixed forgotten the
fixed the missing ?
changed lines that od commented wanted also changed rather then make new issue since hadn't merged
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
fixing more things
Merge branch 'refs/heads/master' into 0.9.12-test-with-caching-and-issue-3846
Merge branch 'refs/heads/master' into 0.9.12-test-with-caching-and-issue-3846

Conflicts:
	features/users/user_delete.feature
squashing issue 3263 down and getting rid of the stylesheet changes

ARGH

Signed-off-by: shalott <shalott@gmail.com>
Converted deprecated vendor/plugins into modules in our lib/ folder instead.

Per this site, fairly straightforward: http://matt.coneybeare.me/how-to-convert-simple-rails-23-style-plugins/

Signed-off-by: shalott <shalott@gmail.com>
Getting rid of "previously defined constant PDF"

Turns out it's because Rails now defines the PDF mime type for us and we no longer have to do it ourselves

Signed-off-by: shalott <shalott@gmail.com>
iconv is being deprecated -- this call is easy to convert to String.encode since we don't need transliteration

Signed-off-by: shalott <shalott@gmail.com>