Adding changes to the multiple edit erb file
Issue 3744 - Fixes capitlization of uses of Tos and Faq to TOS and FAQ
Issue 385 - reorder the Search menu to be consistent with the Browse menu.
3769 In user navigation, make it My Preferences and remove subscriptions count
Fixed issue 2479

efiction chapter downloader would keep getting multiple identical chapters
also improved tests
also made imported links relative

Signed-off-by: shalott <shalott@gmail.com>
Turns out URI.join doesn't like queries :P

Made the relative->absolute change more robust and handled queries, made test non-ambiguous

Signed-off-by: Naomi Novik <shalott@gmail.com>
just trying to bump travis :P

Signed-off-by: shalott <shalott@gmail.com>
Use our nifty URL detector library to check for previous import

Our `find_by_url` already checks for www and non-www, encoded and non-encoded, etc versions of the URL. Let's use it. With spec!
forgot caps on an item
forgot caps on an item
fixed things from od comments
Added tests, hardened efiction importing

Signed-off-by: Naomi Novik <shalott@gmail.com>
Took out unnecessary generalization

Turns out that just closing the </head> fixes all the sites for which this was a useful tool

Signed-off-by: Naomi Novik <shalott@gmail.com>
Update new relic
Merge pull request #1458 from someonefromthewater/issue_3851

3851 - Main Navigation: Order of menu items inconsistent
Merge pull request #1505 from shalott/issue_2479_efiction_updated

Fixed issue 2479 and made imported links absolute
Merge pull request #1516 from otwstephanie/3713

3713
Merge pull request #1520 from zz9pzza/Issue_3907

Update new relic
Update claim.html.erb

Nitpicking.
Merge branch 'refs/heads/master' into 0.9.13-issue-3574-wwwwww

Conflicts:
	spec/models/story_parser_spec.rb