Adding changes to the multiple edit erb file
Issue 3744 - Fixes capitlization of uses of Tos and Faq to TOS and FAQ
3769 In user navigation, make it My Preferences and remove subscriptions count
Changed the #minimal method in URL formatter to strip off anchors and query parameters - except for the sid parameter used by eFiction sites.
Added spec tests to cover eFiction URLs; tweaked #minimal so that it returns an encoded string if it is passed one, rather than just the raw URL.
Using Addressable to handle URIs so things don't break when a URL has an underscore.
Adding Gemfile.lock for Addressable
Merge pull request #1527 from ariana-paris/3574-eFiction-query-parameter

Broaden the URL-mangling to get a match in /redirect
Issue 3920: Break up slow signup summary query
Merge pull request #1533 from elzj/issue_3920_signup_summary_query

Issue 3920: Break up slow signup summary query
Update caching when meta tags are removed
Merge pull request #1535 from elzj/redis_index_keys

Issue 3893: Update caching when meta tags are removed
Update challenge_signup_summary.rb

Use uniq instead of group on array of tags
Merge pull request #1342 from sarken/issue_3769

3769 Make link in drop down say My Preferences & remove subscription count
Merge pull request #1303 from Talvalin/issue_3711_inconsistent_option_order

Adding changes to the multiple edit erb file
Merge pull request #1442 from aaronze/issue_3744

Issue 3744 - Fixes capitlization of uses of Tos and Faq to TOS and FAQ
the-archive.net has gone down

Signed-off-by: shalott <shalott@gmail.com>
Merge pull request #1536 from shalott/archivenet_out_of_tests

the-archive.net has gone down
NULL change
Merge pull request #1539 from zz9pzza/issue_3926

NULL change