21 Jul 2010 merge

* Use Flaptor's Indextank product for search, including santip's patch
* for their new API
* Add Cassandra ConsistencyLevels to the ini file, and storage-conf.xml
* to the public repo
* Patch contributed by umbrae in ticket #929: Add jumpToContent support
* for Keyboard Accessibility
* reddit gold
    - paypal/postcard support
    - friends with benefits
    - profile-page sorting for gold members
    - move domain listings into the permacache

r2/r2/models/mail_queue.py

@@ -300,7 +300,8 @@ class Email(object):
                 "FINISHED_PROMO",
                 "NEW_PROMO",
                 "HELP_TRANSLATE",
-                "NERDMAIL"
+                "NERDMAIL",
+                "GOLDMAIL",
                 )
 
     subjects = {
@@ -320,6 +321,7 @@ class Email(object):
         Kind.NEW_PROMO : _("[reddit] your promotion has been created"),
         Kind.HELP_TRANSLATE : _("[i18n] translation offer from '%(user)s'"),
         Kind.NERDMAIL : _("[reddit] hey, nerd!"),
+        Kind.GOLDMAIL : _("[reddit] reddit gold activation link")
         }
 
     def __init__(self, user, thing, email, from_name, date, ip, banned_ip,