Changed copy on Account Created confirmation page to reflect 24 wait time for email
Updated ERB syntax to allow for translations
3379 Overflowing text in forms
Merge branch 'issue_3636' of git://github.com/cswatt/otwarchive
3636 Confirmation page text change
Merge pull request #1468 from sarken/issue_3636

3636 Account creation confirmation page should say wait 24 hours
Merge pull request #1461 from sarken/issue_3379

3379 Overflowing text in forms and pre tags
Merge pull request #1462 from scottsds/issue_3869

Issue 3869: Add the number of invites being sent out to Invite Request Page
Fix search in all the places it's broken, not just work queries
Only escape unescaped slashes
Merge pull request #1470 from elzj/search_500_fix

Fix search in all the places it's broken, not just work queries
Fix deploy script syntax for primary servers
Add bundle exec to whenever command
DO NOT MERGE ME Testing the user dashboard test
DO NOT MERGE ME Move check for number of series up
DO NOT MERGE make the test MOAR complicated and run again
DO NOT MERGE try find instead of see
DO NOT MERGE add the should see step back in after the failing step to see if it will fucking fail
Merge pull request #1473 from sarken/user_dashboard_test

MERGE ME PLS Changing the user dashboard test
Fixes for issue 3164 (again); also updating .gitignore to ignore RubyMine working folder