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
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
Begin work on improving the User Delete feature tests.
Add a test for deleting a work with a coauthor.
fixing more things
Making challenge_steps respect current year
Merge pull request #1484 from scottsds/challenge_step_updates

Making challenge_steps respect current year
Merge pull request #1471 from someonefromthewater/issue_3229

Issue 3229 - Test for Removing User with a Co-Authored work
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>
Adding the super-useful gem pry for dev/testing -- just stick the line "binding.pry" into your code and run a cuke test, and you'll drop into the code at that point right in your terminal

Signed-off-by: shalott <shalott@gmail.com>
Removed deprecated fakeweb and replaced with typhoeus

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