Don't run failing lib tests.
Fixes for issue 3164 (again); also updating .gitignore to ignore RubyMine working folder
Issue 3164 - Move both lists inside the modules div (from sarken's PR comments).
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 branch 'master' into deploy
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
Merge branch 'master' of https://github.com/otwcode/otwarchive into deploy
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
minor tweak that removes double call to pry
Merge pull request #1540 from shalott/fix_pry_gemfile_warning

minor tweak that removes double call to pry
Fixes errors when signup summary encounters nils
Fixes error when signup summary encounters nils
Merge pull request #1542 from CristinaRO/deploy-issue-3920-redux

Deploy issue 3920 redux