Removed unneeded gunk.

33 files changed, 2 insertions, 2409 deletions

diff --git a/bashrc b/bashrc
index b5fd9ad..715fd3d 100644
--- a/bashrc
+++ b/bashrc
@@ -114,6 +114,6 @@ if ! shopt -oq posix; then
 fi
 
 export GPGKEY="895134C5"
-export PATH="$HOME/bin:$PATH"
+export PATH="$HOME/bin:$HOME/bin/perl6:$PATH"
 export PENTADACTYL_RUNTIME="$HOME/.pentadactyl"
         
diff --git a/mutt/goobook/CHANGES.txt b/mutt/goobook/CHANGES.txt
deleted file mode 100644
index 1b543d6..0000000
--- a/mutt/goobook/CHANGES.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-CHANGES
-=======
-
-dev
----
-
-* Python 2.5 compability
-* Bug when checking for the config file.
-* Support for GnuPG encrypted config file.
-* Support for prompting for the password.
-
-1.2, 2010-03-12
----------------
-
-* Issue 14: Only search in these fields: name, nick, emails, group name.
-  In 1.1 the group URL was also searched, which gave false positives.
-* Auto create cache if it doesn't exist.
-
-1.1, 2010-03-10
----------------
-
-* Use current locale to decode queries.
-* Encode printed text using current locale.
-* Added option to specify different configfile.
-* Some documentation/help updates.
-* The .goobookrc is now really optional.
-* Added config-template command.
-* Issue 13: Added support for contact groups.
-* New cache format, no longer abook compatible (JSON).
-
-1.0, 2010-02-20
----------------
-
-* Issue 2: BadAuthentication error can create a problematic cache file so
-  subsequent runs fail
-* Issue 6: cache management needs improvements
-  - reload, force refresh command
-  - configurable cache expiry time
-* Issue 7: Should probably set safe permissions on settings.pyc
-* Issue 8: 'add' doesn't strip extraneous quotation marks
-* Issue 9: Indentation error when run without arguments
-* Issue 10: Query doesn't browse nicknames
-* New abook compatible cache format.
-* sort results
-* Using SSL
-* New config format
-* .netrc support
-* Supports adding non-ASCII From: headers.
-
-r8, 2009-12-10
---------------
-
-...
-
-// vim: fileencoding=UTF=8 textwidth=79
-
diff --git a/mutt/goobook/CONTRIBUTORS.txt b/mutt/goobook/CONTRIBUTORS.txt
deleted file mode 100644
index 3675c28..0000000
--- a/mutt/goobook/CONTRIBUTORS.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Contributors
-============
-
-* Adam Spiers
-* Alex Bennee
-* Carlos José Barroso
-* Christer Sjöholm
-* i.emre.sahin
-* jlenton
-* T.V. Raman
-
-If you think you name is missing, please add it (alpha order by first name)
-
-
-// vim: fileencoding=UTF=8 textwidth=79
-
diff --git a/mutt/goobook/HACKING.txt b/mutt/goobook/HACKING.txt
deleted file mode 100644
index 9782c46..0000000
--- a/mutt/goobook/HACKING.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Release HOWTO
-=============
-
-To make a release, edit "version" in setup.py and run:
-
-  python setup.py egg_info -RDb "" sdist
-
-To upload the generated source distribution to PyPI, run:
-
-  python setup.py egg_info -RDb "" sdist register upload
-
-Note that if you ignore the ``egg_info -RDb ""`` part, Distribute will generate
-a development release tarball with ``.dev``.
-
diff --git a/mutt/goobook/IDEAS.txt b/mutt/goobook/IDEAS.txt
deleted file mode 100644
index a264ba8..0000000
--- a/mutt/goobook/IDEAS.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-. add/edit interface:
-  A prompting interface, like a wizard for adding.
-  Something like "git add --interactive".
-. export/import commands that can be used with another program for
-  updating contacts. Primarily for batch processing of contacts.
-. Replace current selective cache with storage of the complete googlo contacts dataset.
-. chain search apps? A wrapper (reduce) is probably better.
-
-
-// vim fileencoding=UTF=8 syntax=asciidoc textwidth=79
-
diff --git a/mutt/goobook/LICENSE.txt b/mutt/goobook/LICENSE.txt
deleted file mode 100644
index 94a9ed0..0000000
--- a/mutt/goobook/LICENSE.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/mutt/goobook/MANIFEST.in b/mutt/goobook/MANIFEST.in
deleted file mode 100644
index 7d3ae90..0000000
--- a/mutt/goobook/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include distribute_setup.py
-include *.txt
diff --git a/mutt/goobook/README.txt b/mutt/goobook/README.txt
deleted file mode 100644
index 0816c95..0000000
--- a/mutt/goobook/README.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-GooBook -- Access your Google contacts from the command line.
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-.. contents:: **Table of Contents**
-
--------------------------
-About
--------------------------
-
-The purpose of GooBook is to make it possible to use your Google Contacts in
-a MUA such as Mutt. It's use mimics that of abook (somewhat).
-
--------------------------
-Installation Instructions
--------------------------
-
-GooBook is only released as a source distribution.
-
-It can be installed using easy_install or pip or manually with the source
-tarball.
-
-===================
-easy_install or pip
-===================
-
-This is the recommended way to install goobook.
-If installing this way you will not need to download the source manually.
-
-Run easy_install or pip::
-
-    $ easy_install -U goobook
-    $ pip install goobook
-
-easy_install is part of setuptools which should come with most distributions.
-
-
-===================
-Source installation
-===================
-
-Download the source tarball, uncompress it, then run the install command::
-
-    $ tar -xzvf goobook-*.tar.gz
-    $ cd goobook-*
-    $ sudo python ./setup.py install
-
-=========
-Upgrading
-=========
-
-If you are upgrading from a pre 1.0 version you will have to remove the old
-cachefile and create a new configuration.
-
------------------------------
-Configure
------------------------------
-
-For most users it will be enough to add an entry to your ~/.netrc::
-
-    machine google.com
-      login your@google.email
-      password secret
-
-To get access too more settings you can create ~/.goobookrc::
-
-    [DEFAULT]
-    # If not given here, email and password is taken from .netrc using
-    # machine google.com
-    email: user@gmail.com
-    password: top secret
-    # The following are optional, defaults are shown
-    max_results: 9999
-    cache_filename: ~/.goobook_cache
-    cache_expiry_hours: 24
-
-==============
-Proxy settings
-==============
-
-If you use a proxy you need to set the https_proxy environment variable.
-
------------------------------
-Usage
------------------------------
-
-To query your contacts::
-
-    $ goobook query QUERY
-
-The add command reads a email from STDIN and adds the From address to your Google contacts::
-
-    $ goobook add
-
-The cache is updated automatically according to the configuration but you can also force an update::
-
-    $ goobook reload
-
-==========
-Mutt Setup
-==========
-
-Set in your .muttrc file::
-
-    set query_command="goobook query '%s'
-
-to query address book. (Normally bound to "Q" key.)
-
-If you want to be able to use <tab> to complete email addresses instead of Ctrl-t add this:
-
-    bind editor <Tab> complete-query
-
-To add email addresses (with "a" key normally bound to create-alias command)::
-
-    macro index,pager a "<pipe-message>goobook add<return>" "add the sender address to Google contacts"
-
-If you want to add an email's sender to Contacts, press a while it's selected in the index or pager.
-
------------------------------
-Feedback and getting involved
------------------------------
-
-- Mailing list: http://groups.google.com/group/goobook
-- Issue tracker: http://code.google.com/p/goobook/issues/list
-- Code Repository: http://code.google.com/p/goobook/source/checkout
diff --git a/mutt/goobook/TODO.txt b/mutt/goobook/TODO.txt
deleted file mode 100644
index b57cd4b..0000000
--- a/mutt/goobook/TODO.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Use primary email when sending to groups.
-- Query for phone numbers
diff --git a/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/__init__.py b/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/__init__.py
deleted file mode 100644
index 27c5034..0000000
--- a/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: UTF-8 -*-
-# vim: fileencoding=UTF-8 filetype=python ff=unix et ts=4 sw=4 sts=4 tw=120
-# author: Christer Sjöholm -- hcs AT furuvik DOT net
-
-
diff --git a/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/goobook.py b/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/goobook.py
deleted file mode 100644
index f0f5edf..0000000
--- a/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/goobook.py
+++ /dev/null
@@ -1,352 +0,0 @@
-#!/usr/bin/env python2
-# vim: fileencoding=UTF-8 filetype=python ff=unix expandtab sw=4 sts=4 tw=120
-# maintainer: Christer Sjöholm -- goobook AT furuvik DOT net
-#
-# Copyright (C) 2009  Carlos José Barroso
-# Copyright (C) 2010  Christer Sjöholm
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-'''\
-The idea is make an interface to google contacts that mimics the behaviour of
-abook for mutt. It's developed in python and uses the fine
-google data api (gdata).
-'''
-
-import email.header
-import locale
-import logging
-import optparse
-import getpass
-import sys
-import os
-import subprocess
-import re
-import time
-import ConfigParser
-from netrc import netrc
-from os.path import realpath, expanduser
-from storage import Storage
-
-try:
-    import simplejson
-    json = simplejson # this hushes pyflakes
-except ImportError:
-    import json
-
-import gdata
-from gdata.contacts.client import ContactsClient, ContactsQuery
-from gdata.contacts.data import ContactEntry
-from gdata.data import Email, Name, FullName
-
-log = logging.getLogger('goobook')
-
-CONFIG_FILE = '~/.goobookrc'
-CONFIG_TEMPLATE = '''\
-# "#" or ";" at the start of a line makes it a comment.
-[DEFAULT]
-# If not given here, email and password is taken from .netrc using
-# machine google.com
-;email: user@gmail.com
-;password: top secret
-# The following are optional, defaults are shown
-;max_results: 9999
-;cache_filename: ~/.goobook_cache
-;cache_expiry_hours: 24
-'''
-
-ENCODING = locale.getpreferredencoding()
-
-class GooBook(object):
-    '''This class can't be used as a library as it looks now, it uses sys.stdin
-       print, sys.exit() and getpass().'''
-    def __init__ (self, config):
-        self.config = config
-        self.__client = None
-        self.contacts = {}
-        ''' This is where all the contacts is stored
-        {'contacts': {contact_id: <contact>}
-         'groups': {'group': [contact_id] ]
-        }
-        <contact> is a {'name':'', 'email':''}
-        '''
-
-    @property
-    def password(self):
-        if not self.config.password:
-            self.config.password = getpass.getpass()
-        return self.config.password
-
-    def __get_client(self):
-        '''Login to Google and return a ContactsClient object.
-
-        '''
-        if not self.__client:
-            if not self.config.email or not self.password:
-                print >> sys.stderr, "ERROR: Missing email or password"
-                sys.exit(1)
-            client = ContactsClient()
-            client.ssl = True
-            client.ClientLogin(email=self.config.email, password=self.password, service='cp', source='goobook')
-            self.__client = client
-        return self.__client
-
-    def __query_contacts(self, query):
-        match = re.compile(query, re.I).search
-        for contact in self.contacts['contacts'].itervalues():
-            for field in ('name', 'nick', 'emails'):
-                value = contact.get(field, None)
-                if not value:
-                    pass
-                elif isinstance(value, basestring):
-                    if value and match(value):
-                        yield contact
-                        break
-                else: #value is list
-                    found_one = False
-                    for value2 in value:
-                        if value2 and match(value2):
-                            yield contact
-                            found_one = True
-                            break
-                    if found_one:
-                        break
-
-    def __query_groups(self, query):
-        match = re.compile(query, re.I).search
-        for (group_id, group_name) in self.contacts['groups'].iteritems():
-            if match(group_name):
-                yield (group_name, list(self.__get_group_contacts(group_id)))
-
-    def query(self, query):
-        """Do the query, and print it out in
-
-        """
-        self.load()
-        #query contacts
-        matching_contacts = sorted(self.__query_contacts(query), key=lambda c: c['name'])
-        #query groups
-        matching_groups = sorted(self.__query_groups(query), key=lambda g: g[0])
-        # mutt's query_command expects the first line to be a message,
-        # which it discards.
-        print "\n",
-        for contact in matching_contacts:
-            if 'emails' in contact and contact['emails']:
-                emailaddrs = sorted(contact['emails'])
-                for emailaddr in emailaddrs:
-                    print (u'%s\t%s' % (emailaddr, contact['name'])).encode(ENCODING)
-        for group_name, contacts in matching_groups:
-            emails = ['%s <%s>' % (c['name'], c['emails'][0]) for c in contacts if c['emails']]
-            emails = ', '.join(emails)
-            if not emails:
-                continue
-            print (u'%s\t%s (group)' % (emails, group_name)).encode(ENCODING)
-
-    def __get_group_contacts(self, group_id):
-        for contact in self.contacts['contacts'].itervalues():
-            if group_id in contact['groups']:
-                yield contact
-
-    def load(self):
-        """Load the cached addressbook feed, or fetch it (again) if it is
-        old or missing or invalid or anyting
-
-        """
-        contacts = None
-
-        # if cache older than cache_expiry_hours
-        if (not os.path.exists(self.config.cache_filename) or
-                ((time.time() - os.path.getmtime(self.config.cache_filename)) >
-                    (self.config.cache_expiry_hours * 60 *60))):
-            contacts = self.fetch()
-            self.store(contacts)
-        if not contacts:
-            try:
-                contacts = json.load(open(self.config.cache_filename))
-                if contacts.get('goobook_cache') != '1.1':
-                    contacts = None # Old cache format
-            except ValueError:
-                pass # Failed to read JSON file.
-        if not contacts:
-            contacts = self.fetch()
-            self.store(contacts)
-        if not contacts:
-            raise Exception('Failed to find any contacts') # TODO
-        self.contacts = contacts
-
-
-    def fetch_contacts(self):
-        client = self.__get_client()
-        query = ContactsQuery(max_results=self.config.max_results)
-        entries = client.get_contacts(query=query).entry
-        return dict([self.__parse_contact(ent) for ent in entries])
-
-    @staticmethod
-    def __parse_contact(ent):
-        '''takes a gdata contact entry and returns a parsed contact.
-        on the form (contact_id, {fieldname:content})
-
-        '''
-        contact = {}
-        contact['name'] = ent.title.text
-        contact['emails'] = [emailent.address for emailent in ent.email]
-        if ent.nickname:
-            contact['nick'] = ent.nickname.text
-        contact['groups'] = [g.href for g in ent.group_membership_info]
-        return (ent.id.text, contact)
-
-    def fetch_contact_groups(self):
-        client = self.__get_client()
-        return dict([(g.id.text, g.title.text) for g in client.get_groups().entry])
-
-    def fetch(self):
-        """Actually go out on the wire and fetch the addressbook.
-        Returns the contacts data structure.
-
-        """
-        contacts = self.fetch_contacts()
-        groups = self.fetch_contact_groups()
-        return {'contacts':contacts, 'groups':groups, 'goobook_cache': '1.1'}
-
-    def store(self, contacts):
-        """Pickle the addressbook and a timestamp
-
-        """
-        if contacts: # never write a empty addressbook
-            json.dump(contacts, open(self.config.cache_filename, 'w'), indent=2)
-
-    def add(self):
-        """Add an address from From: field of a mail.
-        This assumes a single mail file is supplied through stdin.
-
-        """
-        from_line = ""
-        for line in sys.stdin:
-            if line.startswith("From: "):
-                from_line = line
-                break
-        if from_line == "":
-            print "Not a valid mail file!"
-            sys.exit(2)
-        #Parse From: line
-        #Take care of non ascii header
-        from_line = unicode(email.header.make_header(email.header.decode_header(from_line)))
-        #Parse the From line
-        (name, mailaddr) = email.utils.parseaddr(from_line)
-        if not name:
-            name = mailaddr
-        #save to contacts
-        client = self.__get_client()
-        new_contact = ContactEntry(name=Name(full_name=FullName(text=name)))
-        new_contact.email.append(Email(address=mailaddr, rel='http://schemas.google.com/g/2005#home', primary='true'))
-        client.create_contact(new_contact)
-        print 'Created contact:', name.encode(ENCODING), mailaddr.encode(ENCODING)
-
-def read_config(config_file):
-    '''Reads the ~/.goobookrc and ~/.netrc.
-    returns the configuration as a dictionary.
-
-    '''
-    config = Storage({ # Default values
-        'email': '',
-        'password': '',
-        'max_results': '9999',
-        'cache_filename': '~/.goobook_cache',
-        'cache_expiry_hours': '24',
-        })
-    config_file = os.path.expanduser(config_file)
-    if os.path.lexists(config_file) or os.path.lexists(config_file + '.gpg'):
-        try:
-            parser = ConfigParser.SafeConfigParser()
-            if os.path.lexists(config_file):
-                log.info('Reading config: %s', config_file)
-                f = open(config_file)
-            else:
-                log.info('Reading config: %s', config_file + '.gpg')
-                sp = subprocess.Popen(['gpg', '--no-tty', '-q', '-d', config_file + ".gpg"], stdout=subprocess.PIPE)
-                f = sp.stdout
-            parser.readfp(f)
-            config.update(dict(parser.items('DEFAULT', raw=True)))
-        except (IOError, ConfigParser.ParsingError), e:
-            print >> sys.stderr, "Failed to read configuration %s\n%s" % (config_file, e)
-            sys.exit(1)
-    if not config.get('email') or not config.get('password'):
-        log.info('email or password missing from config, checking .netrc')
-        auth = netrc().authenticators('google.com')
-        if auth:
-            login = auth[0]
-            password = auth[2]
-            if not config.get('email'):
-                config['email'] = login
-            if not config.get('password'):
-                config['password'] = password
-        else:
-            log.info('No match in .netrc')
-
-        config.cache_filename = realpath(expanduser(config.cache_filename))
-
-        log.debug(config)
-    return config
-
-def main():
-    class MyParser(optparse.OptionParser):
-        def format_epilog(self, formatter):
-            return self.epilog
-    usage = 'usage: %prog [options] <command> [<arg>]'
-    description = 'Search you Google contacts from mutt or the command-line.'
-    epilog = '''\
-Commands:
-  add              Add the senders address to contacts, reads a mail from STDIN.
-  reload           Force reload of the cache.
-  query <query>    Search contacts using query (regex).
-  config-template  Prints a template for .goobookrc to STDOUT
-
-'''
-    parser = MyParser(usage=usage, description=description, epilog=epilog)
-    parser.set_defaults(config_file=CONFIG_FILE)
-    parser.add_option("-c", "--config", dest="config_file",
-                    help="Specify alternative configuration file.", metavar="FILE")
-    parser.add_option("-v", "--verbose", dest="logging_level", default=logging.ERROR,
-                    help="Specify alternative configuration file.",
-                    action='store_const', const=logging.INFO)
-    parser.add_option("-d", "--debug", dest="logging_level",
-                    help="Specify alternative configuration file.",
-                    action='store_const', const=logging.DEBUG)
-    (options, args) = parser.parse_args()
-    if len(args) == 0:
-        parser.print_help()
-        sys.exit(1)
-    logging.basicConfig(level=options.logging_level)
-    config = read_config(options.config_file)
-    goobk = GooBook(config)
-    try:
-        cmd = args.pop(0)
-        if cmd == "query":
-            if len(args) != 1:
-                parser.error("incorrect number of arguments")
-            goobk.query(args[0].decode(ENCODING))
-        elif cmd == "add":
-            goobk.add()
-        elif cmd == "reload":
-            goobk.store(goobk.fetch())
-        elif cmd == "config-template":
-            print CONFIG_TEMPLATE
-        else:
-            parser.error('Command not recognized: %s' % cmd)
-    except gdata.client.BadAuthentication, e:
-        print >> sys.stderr, e # Incorrect username or password
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()
diff --git a/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/storage.py b/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/storage.py
deleted file mode 100644
index 3314327..0000000
--- a/mutt/goobook/build/lib.linux-x86_64-2.7/goobook/storage.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: UTF-8 -*-
-# vim: fileencoding=UTF-8 filetype=python ff=unix et ts=4 sw=4 sts=4 tw=120
-# author: Christer Sjöholm -- hcs AT furuvik DOT net
-
-class Storage(dict):
-    """
-    A Storage object is like a dictionary except `obj.foo` can be used
-    in addition to `obj['foo']`.
-
-        >>> o = storage(a=1)
-        >>> o.a
-        1
-        >>> o['a']
-        1
-        >>> o.a = 2
-        >>> o['a']
-        2
-        >>> del o.a
-        >>> o.a
-        Traceback (most recent call last):
-            ...
-        AttributeError: 'a'
-
-        Storage comes from web.py (public domain)
-    """
-    def __getattr__(self, key):
-        try:
-            return self[key]
-        except KeyError, k:
-            raise AttributeError, k
-
-    def __setattr__(self, key, value):
-        self[key] = value
-
-    def __delattr__(self, key):
-        try:
-            del self[key]
-        except KeyError, k:
-            raise AttributeError, k
-
-    def __repr__(self):
-        return '<Storage ' + dict.__repr__(self) + '>'
-
diff --git a/mutt/goobook/dist/goobook-1.3.dev-py2.7.egg b/mutt/goobook/dist/goobook-1.3.dev-py2.7.egg
deleted file mode 100644
index 0ee81e2..0000000
--- a/mutt/goobook/dist/goobook-1.3.dev-py2.7.egg
+++ /dev/null
diff --git a/mutt/goobook/distribute-0.6.10-py2.7.egg b/mutt/goobook/distribute-0.6.10-py2.7.egg
deleted file mode 100644
index af12d0e..0000000
--- a/mutt/goobook/distribute-0.6.10-py2.7.egg
+++ /dev/null
diff --git a/mutt/goobook/distribute-0.6.10.tar.gz b/mutt/goobook/distribute-0.6.10.tar.gz
deleted file mode 100644
index 772bea9..0000000
--- a/mutt/goobook/distribute-0.6.10.tar.gz
+++ /dev/null
diff --git a/mutt/goobook/distribute_setup.py b/mutt/goobook/distribute_setup.py
deleted file mode 100644
index 0021336..0000000
--- a/mutt/goobook/distribute_setup.py
+++ /dev/null
@@ -1,477 +0,0 @@
-#!python
-"""Bootstrap distribute installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
-    from distribute_setup import use_setuptools
-    use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import os
-import sys
-import time
-import fnmatch
-import tempfile
-import tarfile
-from distutils import log
-
-try:
-    from site import USER_SITE
-except ImportError:
-    USER_SITE = None
-
-try:
-    import subprocess
-
-    def _python_cmd(*args):
-        args = (sys.executable,) + args
-        return subprocess.call(args) == 0
-
-except ImportError:
-    # will be used for python 2.3
-    def _python_cmd(*args):
-        args = (sys.executable,) + args
-        # quoting arguments if windows
-        if sys.platform == 'win32':
-            def quote(arg):
-                if ' ' in arg:
-                    return '"%s"' % arg
-                return arg
-            args = [quote(arg) for arg in args]
-        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
-
-DEFAULT_VERSION = "0.6.10"
-DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
-SETUPTOOLS_FAKED_VERSION = "0.6c11"
-
-SETUPTOOLS_PKG_INFO = """\
-Metadata-Version: 1.0
-Name: setuptools
-Version: %s
-Summary: xxxx
-Home-page: xxx
-Author: xxx
-Author-email: xxx
-License: xxx
-Description: xxx
-""" % SETUPTOOLS_FAKED_VERSION
-
-
-def _install(tarball):
-    # extracting the tarball
-    tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s', tmpdir)
-    old_wd = os.getcwd()
-    try:
-        os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        _extractall(tar)
-        tar.close()
-
-        # going in the directory
-        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-        os.chdir(subdir)
-        log.warn('Now working in %s', subdir)
-
-        # installing
-        log.warn('Installing Distribute')
-        if not _python_cmd('setup.py', 'install'):
-            log.warn('Something went wrong during the installation.')
-            log.warn('See the error message above.')
-    finally:
-        os.chdir(old_wd)
-
-
-def _build_egg(egg, tarball, to_dir):
-    # extracting the tarball
-    tmpdir = tempfile.mkdtemp()
-    log.warn('Extracting in %s', tmpdir)
-    old_wd = os.getcwd()
-    try:
-        os.chdir(tmpdir)
-        tar = tarfile.open(tarball)
-        _extractall(tar)
-        tar.close()
-
-        # going in the directory
-        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-        os.chdir(subdir)
-        log.warn('Now working in %s', subdir)
-
-        # building an egg
-        log.warn('Building a Distribute egg in %s', to_dir)
-        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
-
-    finally:
-        os.chdir(old_wd)
-    # returning the result
-    log.warn(egg)
-    if not os.path.exists(egg):
-        raise IOError('Could not build the egg.')
-
-
-def _do_download(version, download_base, to_dir, download_delay):
-    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
-                       % (version, sys.version_info[0], sys.version_info[1]))
-    if not os.path.exists(egg):
-        tarball = download_setuptools(version, download_base,
-                                      to_dir, download_delay)
-        _build_egg(egg, tarball, to_dir)
-    sys.path.insert(0, egg)
-    import setuptools
-    setuptools.bootstrap_install_from = egg
-
-
-def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                   to_dir=os.curdir, download_delay=15, no_fake=True):
-    # making sure we use the absolute path
-    to_dir = os.path.abspath(to_dir)
-    was_imported = 'pkg_resources' in sys.modules or \
-        'setuptools' in sys.modules
-    try:
-        try:
-            import pkg_resources
-            if not hasattr(pkg_resources, '_distribute'):
-                if not no_fake:
-                    _fake_setuptools()
-                raise ImportError
-        except ImportError:
-            return _do_download(version, download_base, to_dir, download_delay)
-        try:
-            pkg_resources.require("distribute>="+version)
-            return
-        except pkg_resources.VersionConflict:
-            e = sys.exc_info()[1]
-            if was_imported:
-                sys.stderr.write(
-                "The required version of distribute (>=%s) is not available,\n"
-                "and can't be installed while this script is running. Please\n"
-                "install a more recent version first, using\n"
-                "'easy_install -U distribute'."
-                "\n\n(Currently using %r)\n" % (version, e.args[0]))
-                sys.exit(2)
-            else:
-                del pkg_resources, sys.modules['pkg_resources']    # reload ok
-                return _do_download(version, download_base, to_dir,
-                                    download_delay)
-        except pkg_resources.DistributionNotFound:
-            return _do_download(version, download_base, to_dir,
-                                download_delay)
-    finally:
-        if not no_fake:
-            _create_fake_setuptools_pkg_info(to_dir)
-
-def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-                        to_dir=os.curdir, delay=15):
-    """Download distribute from a specified location and return its filename
-
-    `version` should be a valid distribute version number that is available
-    as an egg for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download
-    attempt.
-    """
-    # making sure we use the absolute path
-    to_dir = os.path.abspath(to_dir)
-    try:
-        from urllib.request import urlopen
-    except ImportError:
-        from urllib2 import urlopen
-    tgz_name = "distribute-%s.tar.gz" % version
-    url = download_base + tgz_name
-    saveto = os.path.join(to_dir, tgz_name)
-    src = dst = None
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            log.warn("Downloading %s", url)
-            src = urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = src.read()
-            dst = open(saveto, "wb")
-            dst.write(data)
-        finally:
-            if src:
-                src.close()
-            if dst:
-                dst.close()
-    return os.path.realpath(saveto)
-
-
-def _patch_file(path, content):
-    """Will backup the file then patch it"""
-    existing_content = open(path).read()
-    if existing_content == content:
-        # already patched
-        log.warn('Already patched.')
-        return False
-    log.warn('Patching...')
-    _rename_path(path)
-    f = open(path, 'w')
-    try:
-        f.write(content)
-    finally:
-        f.close()
-    return True
-
-
-def _same_content(path, content):
-    return open(path).read() == content
-
-def _no_sandbox(function):
-    def __no_sandbox(*args, **kw):
-        try:
-            from setuptools.sandbox import DirectorySandbox
-            def violation(*args):
-                pass
-            DirectorySandbox._old = DirectorySandbox._violation
-            DirectorySandbox._violation = violation
-            patched = True
-        except ImportError:
-            patched = False
-
-        try:
-            return function(*args, **kw)
-        finally:
-            if patched:
-                DirectorySandbox._violation = DirectorySandbox._old
-                del DirectorySandbox._old
-
-    return __no_sandbox
-
-@_no_sandbox
-def _rename_path(path):
-    new_name = path + '.OLD.%s' % time.time()
-    log.warn('Renaming %s into %s', path, new_name)
-    os.rename(path, new_name)
-    return new_name
-
-def _remove_flat_installation(placeholder):
-    if not os.path.isdir(placeholder):
-        log.warn('Unkown installation at %s', placeholder)
-        return False
-    found = False
-    for file in os.listdir(placeholder):
-        if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
-            found = True
-            break
-    if not found:
-        log.warn('Could not locate setuptools*.egg-info')
-        return
-
-    log.warn('Removing elements out of the way...')
-    pkg_info = os.path.join(placeholder, file)
-    if os.path.isdir(pkg_info):
-        patched = _patch_egg_dir(pkg_info)
-    else:
-        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
-
-    if not patched:
-        log.warn('%s already patched.', pkg_info)
-        return False
-    # now let's move the files out of the way
-    for element in ('setuptools', 'pkg_resources.py', 'site.py'):
-        element = os.path.join(placeholder, element)
-        if os.path.exists(element):
-            _rename_path(element)
-        else:
-            log.warn('Could not find the %s element of the '
-                     'Setuptools distribution', element)
-    return True
-
-
-def _after_install(dist):
-    log.warn('After install bootstrap.')
-    placeholder = dist.get_command_obj('install').install_purelib
-    _create_fake_setuptools_pkg_info(placeholder)
-
-@_no_sandbox
-def _create_fake_setuptools_pkg_info(placeholder):
-    if not placeholder or not os.path.exists(placeholder):
-        log.warn('Could not find the install location')
-        return
-    pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
-            (SETUPTOOLS_FAKED_VERSION, pyver)
-    pkg_info = os.path.join(placeholder, setuptools_file)
-    if os.path.exists(pkg_info):
-        log.warn('%s already exists', pkg_info)
-        return
-
-    log.warn('Creating %s', pkg_info)
-    f = open(pkg_info, 'w')
-    try:
-        f.write(SETUPTOOLS_PKG_INFO)
-    finally:
-        f.close()
-
-    pth_file = os.path.join(placeholder, 'setuptools.pth')
-    log.warn('Creating %s', pth_file)
-    f = open(pth_file, 'w')
-    try:
-        f.write(os.path.join(os.curdir, setuptools_file))
-    finally:
-        f.close()
-
-def _patch_egg_dir(path):
-    # let's check if it's already patched
-    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
-    if os.path.exists(pkg_info):
-        if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
-            log.warn('%s already patched.', pkg_info)
-            return False
-    _rename_path(path)
-    os.mkdir(path)
-    os.mkdir(os.path.join(path, 'EGG-INFO'))
-    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
-    f = open(pkg_info, 'w')
-    try:
-        f.write(SETUPTOOLS_PKG_INFO)
-    finally:
-        f.close()
-    return True
-
-
-def _before_install():
-    log.warn('Before install bootstrap.')
-    _fake_setuptools()
-
-
-def _under_prefix(location):
-    if 'install' not in sys.argv:
-        return True
-    args = sys.argv[sys.argv.index('install')+1:]
-    for index, arg in enumerate(args):
-        for option in ('--root', '--prefix'):
-            if arg.startswith('%s=' % option):
-                top_dir = arg.split('root=')[-1]
-                return location.startswith(top_dir)
-            elif arg == option:
-                if len(args) > index:
-                    top_dir = args[index+1]
-                    return location.startswith(top_dir)
-            elif option == '--user' and USER_SITE is not None:
-                return location.startswith(USER_SITE)
-    return True
-
-
-def _fake_setuptools():
-    log.warn('Scanning installed packages')
-    try:
-        import pkg_resources
-    except ImportError:
-        # we're cool
-        log.warn('Setuptools or Distribute does not seem to be installed.')
-        return
-    ws = pkg_resources.working_set
-    try:
-        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
-                                  replacement=False))
-    except TypeError:
-        # old distribute API
-        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
-
-    if setuptools_dist is None:
-        log.warn('No setuptools distribution found')
-        return
-    # detecting if it was already faked
-    setuptools_location = setuptools_dist.location
-    log.warn('Setuptools installation detected at %s', setuptools_location)
-
-    # if --root or --preix was provided, and if
-    # setuptools is not located in them, we don't patch it
-    if not _under_prefix(setuptools_location):
-        log.warn('Not patching, --root or --prefix is installing Distribute'
-                 ' in another location')
-        return
-
-    # let's see if its an egg
-    if not setuptools_location.endswith('.egg'):
-        log.warn('Non-egg installation')
-        res = _remove_flat_installation(setuptools_location)
-        if not res:
-            return
-    else:
-        log.warn('Egg installation')
-        pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
-        if (os.path.exists(pkg_info) and
-            _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
-            log.warn('Already patched.')
-            return
-        log.warn('Patching...')
-        # let's create a fake egg replacing setuptools one
-        res = _patch_egg_dir(setuptools_location)
-        if not res:
-            return
-    log.warn('Patched done.')
-    _relaunch()
-
-
-def _relaunch():
-    log.warn('Relaunching...')
-    # we have to relaunch the process
-    args = [sys.executable] + sys.argv
-    sys.exit(subprocess.call(args))
-
-
-def _extractall(self, path=".", members=None):
-    """Extract all members from the archive to the current working
-       directory and set owner, modification time and permissions on
-       directories afterwards. `path' specifies a different directory
-       to extract to. `members' is optional and must be a subset of the
-       list returned by getmembers().
-    """
-    import copy
-    import operator
-    from tarfile import ExtractError
-    directories = []
-
-    if members is None:
-        members = self
-
-    for tarinfo in members:
-        if tarinfo.isdir():
-            # Extract directories with a safe mode.
-            directories.append(tarinfo)
-            tarinfo = copy.copy(tarinfo)
-            tarinfo.mode = 448 # decimal for oct 0700
-        self.extract(tarinfo, path)
-
-    # Reverse sort directories.
-    if sys.version_info < (2, 4):
-        def sorter(dir1, dir2):
-            return cmp(dir1.name, dir2.name)
-        directories.sort(sorter)
-        directories.reverse()
-    else:
-        directories.sort(key=operator.attrgetter('name'), reverse=True)
-
-    # Set correct owner, mtime and filemode on directories.
-    for tarinfo in directories:
-        dirpath = os.path.join(path, tarinfo.name)
-        try:
-            self.chown(tarinfo, dirpath)
-            self.utime(tarinfo, dirpath)
-            self.chmod(tarinfo, dirpath)
-        except ExtractError:
-            e = sys.exc_info()[1]
-            if self.errorlevel > 1:
-                raise
-            else:
-                self._dbg(1, "tarfile: %s" % e)
-
-
-def main(argv, version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
-    tarball = download_setuptools()
-    _install(tarball)
-
-
-if __name__ == '__main__':
-    main(sys.argv[1:])
diff --git a/mutt/goobook/distribute_setup.pyc b/mutt/goobook/distribute_setup.pyc
deleted file mode 100644
index 1330e29..0000000
--- a/mutt/goobook/distribute_setup.pyc
+++ /dev/null
diff --git a/mutt/goobook/goobook.egg-info/PKG-INFO b/mutt/goobook/goobook.egg-info/PKG-INFO
deleted file mode 100644
index 352dc93..0000000
--- a/mutt/goobook/goobook.egg-info/PKG-INFO
+++ /dev/null
@@ -1,143 +0,0 @@
-Metadata-Version: 1.1
-Name: goobook
-Version: 1.3.dev
-Summary: Search your google contacts from mutt.
-Home-page: http://goobook.googlecode.com/
-Author: Christer Sjöholm
-Author-email: goobook@furuvik.net
-License: GPLv3
-Description: :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-        GooBook -- Access your Google contacts from the command line.
-        :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-        
-        .. contents:: **Table of Contents**
-        
-        -------------------------
-        About
-        -------------------------
-        
-        The purpose of GooBook is to make it possible to use your Google Contacts in
-        a MUA such as Mutt. It's use mimics that of abook (somewhat).
-        
-        -------------------------
-        Installation Instructions
-        -------------------------
-        
-        GooBook is only released as a source distribution.
-        
-        It can be installed using easy_install or pip or manually with the source
-        tarball.
-        
-        ===================
-        easy_install or pip
-        ===================
-        
-        This is the recommended way to install goobook.
-        If installing this way you will not need to download the source manually.
-        
-        Run easy_install or pip::
-        
-            $ easy_install -U goobook
-            $ pip install goobook
-        
-        easy_install is part of setuptools which should come with most distributions.
-        
-        
-        ===================
-        Source installation
-        ===================
-        
-        Download the source tarball, uncompress it, then run the install command::
-        
-            $ tar -xzvf goobook-*.tar.gz
-            $ cd goobook-*
-            $ sudo python ./setup.py install
-        
-        =========
-        Upgrading
-        =========
-        
-        If you are upgrading from a pre 1.0 version you will have to remove the old
-        cachefile and create a new configuration.
-        
-        -----------------------------
-        Configure
-        -----------------------------
-        
-        For most users it will be enough to add an entry to your ~/.netrc::
-        
-            machine google.com
-              login your@google.email
-              password secret
-        
-        To get access too more settings you can create ~/.goobookrc::
-        
-            [DEFAULT]
-            # If not given here, email and password is taken from .netrc using
-            # machine google.com
-            email: user@gmail.com
-            password: top secret
-            # The following are optional, defaults are shown
-            max_results: 9999
-            cache_filename: ~/.goobook_cache
-            cache_expiry_hours: 24
-        
-        ==============
-        Proxy settings
-        ==============
-        
-        If you use a proxy you need to set the https_proxy environment variable.
-        
-        -----------------------------
-        Usage
-        -----------------------------
-        
-        To query your contacts::
-        
-            $ goobook query QUERY
-        
-        The add command reads a email from STDIN and adds the From address to your Google contacts::
-        
-            $ goobook add
-        
-        The cache is updated automatically according to the configuration but you can also force an update::
-        
-            $ goobook reload
-        
-        ==========
-        Mutt Setup
-        ==========
-        
-        Set in your .muttrc file::
-        
-            set query_command="goobook query '%s'
-        
-        to query address book. (Normally bound to "Q" key.)
-        
-        If you want to be able to use <tab> to complete email addresses instead of Ctrl-t add this:
-        
-            bind editor <Tab> complete-query
-        
-        To add email addresses (with "a" key normally bound to create-alias command)::
-        
-            macro index,pager a "<pipe-message>goobook add<return>" "add the sender address to Google contacts"
-        
-        If you want to add an email's sender to Contacts, press a while it's selected in the index or pager.
-        
-        -----------------------------
-        Feedback and getting involved
-        -----------------------------
-        
-        - Mailing list: http://groups.google.com/group/goobook
-        - Issue tracker: http://code.google.com/p/goobook/issues/list
-        - Code Repository: http://code.google.com/p/goobook/source/checkout
-        
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
-Classifier: Topic :: Communications :: Email :: Address Book
diff --git a/mutt/goobook/goobook.egg-info/SOURCES.txt b/mutt/goobook/goobook.egg-info/SOURCES.txt
deleted file mode 100644
index 2952719..0000000
--- a/mutt/goobook/goobook.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-CHANGES.txt
-CONTRIBUTORS.txt
-HACKING.txt
-IDEAS.txt
-LICENSE.txt
-MANIFEST.in
-README.txt
-TODO.txt
-distribute_setup.py
-setup.cfg
-setup.py
-goobook/__init__.py
-goobook/goobook.py
-goobook/storage.py
-goobook.egg-info/PKG-INFO
-goobook.egg-info/SOURCES.txt
-goobook.egg-info/dependency_links.txt
-goobook.egg-info/entry_points.txt
-goobook.egg-info/requires.txt
-goobook.egg-info/top_level.txt
\ No newline at end of file
diff --git a/mutt/goobook/goobook.egg-info/dependency_links.txt b/mutt/goobook/goobook.egg-info/dependency_links.txt
deleted file mode 100644
index 8b13789..0000000
--- a/mutt/goobook/goobook.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/mutt/goobook/goobook.egg-info/entry_points.txt b/mutt/goobook/goobook.egg-info/entry_points.txt
deleted file mode 100644
index 78a4309..0000000
--- a/mutt/goobook/goobook.egg-info/entry_points.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[console_scripts]
-goobook = goobook.goobook:main
-
diff --git a/mutt/goobook/goobook.egg-info/requires.txt b/mutt/goobook/goobook.egg-info/requires.txt
deleted file mode 100644
index 7001f7f..0000000
--- a/mutt/goobook/goobook.egg-info/requires.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-gdata>=2.0.7
-simplejson>=2.1.0
\ No newline at end of file
diff --git a/mutt/goobook/goobook.egg-info/top_level.txt b/mutt/goobook/goobook.egg-info/top_level.txt
deleted file mode 100644
index a50f73c..0000000
--- a/mutt/goobook/goobook.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-goobook
diff --git a/mutt/goobook/goobook/__init__.py b/mutt/goobook/goobook/__init__.py
deleted file mode 100644
index 27c5034..0000000
--- a/mutt/goobook/goobook/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- coding: UTF-8 -*-
-# vim: fileencoding=UTF-8 filetype=python ff=unix et ts=4 sw=4 sts=4 tw=120
-# author: Christer Sjöholm -- hcs AT furuvik DOT net
-
-
diff --git a/mutt/goobook/goobook/goobook.py b/mutt/goobook/goobook/goobook.py
deleted file mode 100755
index f0f5edf..0000000
--- a/mutt/goobook/goobook/goobook.py
+++ /dev/null
@@ -1,352 +0,0 @@
-#!/usr/bin/env python2
-# vim: fileencoding=UTF-8 filetype=python ff=unix expandtab sw=4 sts=4 tw=120
-# maintainer: Christer Sjöholm -- goobook AT furuvik DOT net
-#
-# Copyright (C) 2009  Carlos José Barroso
-# Copyright (C) 2010  Christer Sjöholm
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-'''\
-The idea is make an interface to google contacts that mimics the behaviour of
-abook for mutt. It's developed in python and uses the fine
-google data api (gdata).
-'''
-
-import email.header
-import locale
-import logging
-import optparse
-import getpass
-import sys
-import os
-import subprocess
-import re
-import time
-import ConfigParser
-from netrc import netrc
-from os.path import realpath, expanduser
-from storage import Storage
-
-try:
-    import simplejson
-    json = simplejson # this hushes pyflakes
-except ImportError:
-    import json
-
-import gdata
-from gdata.contacts.client import ContactsClient, ContactsQuery
-from gdata.contacts.data import ContactEntry
-from gdata.data import Email, Name, FullName
-
-log = logging.getLogger('goobook')
-
-CONFIG_FILE = '~/.goobookrc'
-CONFIG_TEMPLATE = '''\
-# "#" or ";" at the start of a line makes it a comment.
-[DEFAULT]
-# If not given here, email and password is taken from .netrc using
-# machine google.com
-;email: user@gmail.com
-;password: top secret
-# The following are optional, defaults are shown
-;max_results: 9999
-;cache_filename: ~/.goobook_cache
-;cache_expiry_hours: 24
-'''
-
-ENCODING = locale.getpreferredencoding()
-
-class GooBook(object):
-    '''This class can't be used as a library as it looks now, it uses sys.stdin
-       print, sys.exit() and getpass().'''
-    def __init__ (self, config):
-        self.config = config
-        self.__client = None
-        self.contacts = {}
-        ''' This is where all the contacts is stored
-        {'contacts': {contact_id: <contact>}
-         'groups': {'group': [contact_id] ]
-        }
-        <contact> is a {'name':'', 'email':''}
-        '''
-
-    @property
-    def password(self):
-        if not self.config.password:
-            self.config.password = getpass.getpass()
-        return self.config.password
-
-    def __get_client(self):
-        '''Login to Google and return a ContactsClient object.
-
-        '''
-        if not self.__client:
-            if not self.config.email or not self.password:
-                print >> sys.stderr, "ERROR: Missing email or password"
-                sys.exit(1)
-            client = ContactsClient()
-            client.ssl = True
-            client.ClientLogin(email=self.config.email, password=self.password, service='cp', source='goobook')
-            self.__client = client
-        return self.__client
-
-    def __query_contacts(self, query):
-        match = re.compile(query, re.I).search
-        for contact in self.contacts['contacts'].itervalues():
-            for field in ('name', 'nick', 'emails'):
-                value = contact.get(field, None)
-                if not value:
-                    pass
-                elif isinstance(value, basestring):
-                    if value and match(value):
-                        yield contact
-                        break
-                else: #value is list
-                    found_one = False
-                    for value2 in value:
-                        if value2 and match(value2):
-                            yield contact
-                            found_one = True
-                            break
-                    if found_one:
-                        break
-
-    def __query_groups(self, query):
-        match = re.compile(query, re.I).search
-        for (group_id, group_name) in self.contacts['groups'].iteritems():
-            if match(group_name):
-                yield (group_name, list(self.__get_group_contacts(group_id)))
-
-    def query(self, query):
-        """Do the query, and print it out in
-
-        """
-        self.load()
-        #query contacts
-        matching_contacts = sorted(self.__query_contacts(query), key=lambda c: c['name'])
-        #query groups
-        matching_groups = sorted(self.__query_groups(query), key=lambda g: g[0])
-        # mutt's query_command expects the first line to be a message,
-        # which it discards.
-        print "\n",
-        for contact in matching_contacts:
-            if 'emails' in contact and contact['emails']:
-                emailaddrs = sorted(contact['emails'])
-                for emailaddr in emailaddrs:
-                    print (u'%s\t%s' % (emailaddr, contact['name'])).encode(ENCODING)
-        for group_name, contacts in matching_groups:
-            emails = ['%s <%s>' % (c['name'], c['emails'][0]) for c in contacts if c['emails']]
-            emails = ', '.join(emails)
-            if not emails:
-                continue
-            print (u'%s\t%s (group)' % (emails, group_name)).encode(ENCODING)
-
-    def __get_group_contacts(self, group_id):
-        for contact in self.contacts['contacts'].itervalues():
-            if group_id in contact['groups']:
-                yield contact
-
-    def load(self):
-        """Load the cached addressbook feed, or fetch it (again) if it is
-        old or missing or invalid or anyting
-
-        """
-        contacts = None
-
-        # if cache older than cache_expiry_hours
-        if (not os.path.exists(self.config.cache_filename) or
-                ((time.time() - os.path.getmtime(self.config.cache_filename)) >
-                    (self.config.cache_expiry_hours * 60 *60))):
-            contacts = self.fetch()
-            self.store(contacts)
-        if not contacts:
-            try:
-                contacts = json.load(open(self.config.cache_filename))
-                if contacts.get('goobook_cache') != '1.1':
-                    contacts = None # Old cache format
-            except ValueError:
-                pass # Failed to read JSON file.
-        if not contacts:
-            contacts = self.fetch()
-            self.store(contacts)
-        if not contacts:
-            raise Exception('Failed to find any contacts') # TODO
-        self.contacts = contacts
-
-
-    def fetch_contacts(self):
-        client = self.__get_client()
-        query = ContactsQuery(max_results=self.config.max_results)
-        entries = client.get_contacts(query=query).entry
-        return dict([self.__parse_contact(ent) for ent in entries])
-
-    @staticmethod
-    def __parse_contact(ent):
-        '''takes a gdata contact entry and returns a parsed contact.
-        on the form (contact_id, {fieldname:content})
-
-        '''
-        contact = {}
-        contact['name'] = ent.title.text
-        contact['emails'] = [emailent.address for emailent in ent.email]
-        if ent.nickname:
-            contact['nick'] = ent.nickname.text
-        contact['groups'] = [g.href for g in ent.group_membership_info]
-        return (ent.id.text, contact)
-
-    def fetch_contact_groups(self):
-        client = self.__get_client()
-        return dict([(g.id.text, g.title.text) for g in client.get_groups().entry])
-
-    def fetch(self):
-        """Actually go out on the wire and fetch the addressbook.
-        Returns the contacts data structure.
-
-        """
-        contacts = self.fetch_contacts()
-        groups = self.fetch_contact_groups()
-        return {'contacts':contacts, 'groups':groups, 'goobook_cache': '1.1'}
-
-    def store(self, contacts):
-        """Pickle the addressbook and a timestamp
-
-        """
-        if contacts: # never write a empty addressbook
-            json.dump(contacts, open(self.config.cache_filename, 'w'), indent=2)
-
-    def add(self):
-        """Add an address from From: field of a mail.
-        This assumes a single mail file is supplied through stdin.
-
-        """
-        from_line = ""
-        for line in sys.stdin:
-            if line.startswith("From: "):
-                from_line = line
-                break
-        if from_line == "":
-            print "Not a valid mail file!"
-            sys.exit(2)
-        #Parse From: line
-        #Take care of non ascii header
-        from_line = unicode(email.header.make_header(email.header.decode_header(from_line)))
-        #Parse the From line
-        (name, mailaddr) = email.utils.parseaddr(from_line)
-        if not name:
-            name = mailaddr
-        #save to contacts
-        client = self.__get_client()
-        new_contact = ContactEntry(name=Name(full_name=FullName(text=name)))
-        new_contact.email.append(Email(address=mailaddr, rel='http://schemas.google.com/g/2005#home', primary='true'))
-        client.create_contact(new_contact)
-        print 'Created contact:', name.encode(ENCODING), mailaddr.encode(ENCODING)
-
-def read_config(config_file):
-    '''Reads the ~/.goobookrc and ~/.netrc.
-    returns the configuration as a dictionary.
-
-    '''
-    config = Storage({ # Default values
-        'email': '',
-        'password': '',
-        'max_results': '9999',
-        'cache_filename': '~/.goobook_cache',
-        'cache_expiry_hours': '24',
-        })
-    config_file = os.path.expanduser(config_file)
-    if os.path.lexists(config_file) or os.path.lexists(config_file + '.gpg'):
-        try:
-            parser = ConfigParser.SafeConfigParser()
-            if os.path.lexists(config_file):
-                log.info('Reading config: %s', config_file)
-                f = open(config_file)
-            else:
-                log.info('Reading config: %s', config_file + '.gpg')
-                sp = subprocess.Popen(['gpg', '--no-tty', '-q', '-d', config_file + ".gpg"], stdout=subprocess.PIPE)
-                f = sp.stdout
-            parser.readfp(f)
-            config.update(dict(parser.items('DEFAULT', raw=True)))
-        except (IOError, ConfigParser.ParsingError), e:
-            print >> sys.stderr, "Failed to read configuration %s\n%s" % (config_file, e)
-            sys.exit(1)
-    if not config.get('email') or not config.get('password'):
-        log.info('email or password missing from config, checking .netrc')
-        auth = netrc().authenticators('google.com')
-        if auth:
-            login = auth[0]
-            password = auth[2]
-            if not config.get('email'):
-                config['email'] = login
-            if not config.get('password'):
-                config['password'] = password
-        else:
-            log.info('No match in .netrc')
-
-        config.cache_filename = realpath(expanduser(config.cache_filename))
-
-        log.debug(config)
-    return config
-
-def main():
-    class MyParser(optparse.OptionParser):
-        def format_epilog(self, formatter):
-            return self.epilog
-    usage = 'usage: %prog [options] <command> [<arg>]'
-    description = 'Search you Google contacts from mutt or the command-line.'
-    epilog = '''\
-Commands:
-  add              Add the senders address to contacts, reads a mail from STDIN.
-  reload           Force reload of the cache.
-  query <query>    Search contacts using query (regex).
-  config-template  Prints a template for .goobookrc to STDOUT
-
-'''
-    parser = MyParser(usage=usage, description=description, epilog=epilog)
-    parser.set_defaults(config_file=CONFIG_FILE)
-    parser.add_option("-c", "--config", dest="config_file",
-                    help="Specify alternative configuration file.", metavar="FILE")
-    parser.add_option("-v", "--verbose", dest="logging_level", default=logging.ERROR,
-                    help="Specify alternative configuration file.",
-                    action='store_const', const=logging.INFO)
-    parser.add_option("-d", "--debug", dest="logging_level",
-                    help="Specify alternative configuration file.",
-                    action='store_const', const=logging.DEBUG)
-    (options, args) = parser.parse_args()
-    if len(args) == 0:
-        parser.print_help()
-        sys.exit(1)
-    logging.basicConfig(level=options.logging_level)
-    config = read_config(options.config_file)
-    goobk = GooBook(config)
-    try:
-        cmd = args.pop(0)
-        if cmd == "query":
-            if len(args) != 1:
-                parser.error("incorrect number of arguments")
-            goobk.query(args[0].decode(ENCODING))
-        elif cmd == "add":
-            goobk.add()
-        elif cmd == "reload":
-            goobk.store(goobk.fetch())
-        elif cmd == "config-template":
-            print CONFIG_TEMPLATE
-        else:
-            parser.error('Command not recognized: %s' % cmd)
-    except gdata.client.BadAuthentication, e:
-        print >> sys.stderr, e # Incorrect username or password
-        sys.exit(1)
-
-if __name__ == '__main__':
-    main()
diff --git a/mutt/goobook/goobook/storage.py b/mutt/goobook/goobook/storage.py
deleted file mode 100644
index 3314327..0000000
--- a/mutt/goobook/goobook/storage.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: UTF-8 -*-
-# vim: fileencoding=UTF-8 filetype=python ff=unix et ts=4 sw=4 sts=4 tw=120
-# author: Christer Sjöholm -- hcs AT furuvik DOT net
-
-class Storage(dict):
-    """
-    A Storage object is like a dictionary except `obj.foo` can be used
-    in addition to `obj['foo']`.
-
-        >>> o = storage(a=1)
-        >>> o.a
-        1
-        >>> o['a']
-        1
-        >>> o.a = 2
-        >>> o['a']
-        2
-        >>> del o.a
-        >>> o.a
-        Traceback (most recent call last):
-            ...
-        AttributeError: 'a'
-
-        Storage comes from web.py (public domain)
-    """
-    def __getattr__(self, key):
-        try:
-            return self[key]
-        except KeyError, k:
-            raise AttributeError, k
-
-    def __setattr__(self, key, value):
-        self[key] = value
-
-    def __delattr__(self, key):
-        try:
-            del self[key]
-        except KeyError, k:
-            raise AttributeError, k
-
-    def __repr__(self):
-        return '<Storage ' + dict.__repr__(self) + '>'
-
diff --git a/mutt/goobook/setup.cfg b/mutt/goobook/setup.cfg
deleted file mode 100644
index 018c3b4..0000000
--- a/mutt/goobook/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[egg_info]
-tag_build = .dev
diff --git a/mutt/goobook/setup.py b/mutt/goobook/setup.py
deleted file mode 100755
index edff2ea..0000000
--- a/mutt/goobook/setup.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python
-# vim: fileencoding=UTF-8 filetype=python ff=unix expandtab sw=4 sts=4 tw=120
-# author: Christer Sjöholm -- goobook AT furuvik DOT net
-
-from distribute_setup import use_setuptools
-use_setuptools()
-
-from setuptools import setup, find_packages
-class UltraMagicString(object):
-    ''' Stolen from http://stackoverflow.com/questions/1162338/whats-the-right-way-to-use-unicode-metadata-in-setup-py
-
-    Catch-22:
-    - if I return Unicode, python setup.py --long-description as well
-      as python setup.py upload fail with a UnicodeEncodeError
-    - if I return UTF-8 string, python setup.py sdist register
-      fails with an UnicodeDecodeError
-    '''
-
-    def __init__(self, value):
-        self.value = value
-
-    def __str__(self):
-        return self.value
-
-    def __unicode__(self):
-        return self.value.decode('UTF-8')
-
-    def __add__(self, other):
-        return UltraMagicString(self.value + str(other))
-
-    def split(self, *args, **kw):
-        return self.value.split(*args, **kw)
-
-setup(name='goobook',
-      version = '1.3',
-      description = 'Search your google contacts from mutt.',
-      long_description=UltraMagicString(open('README.txt').read()),
-      maintainer = UltraMagicString('Christer Sjöholm'),
-      maintainer_email = 'goobook@furuvik.net',
-      url = 'http://goobook.googlecode.com/',
-      classifiers = [f.strip() for f in """
-        Development Status :: 5 - Production/Stable
-        Environment :: Console
-        Operating System :: OS Independent
-        Programming Language :: Python
-        Programming Language :: Python :: 2.6
-        Intended Audience :: End Users/Desktop
-        License :: OSI Approved :: GNU General Public License (GPL)
-        Topic :: Communications :: Email :: Address Book
-        """.splitlines() if f.strip()],
-      license = 'GPLv3',
-      install_requires = [
-          'gdata>=2.0.7',
-          'simplejson>=2.1.0'],
-      packages = find_packages(),
-      entry_points = {'console_scripts': [ 'goobook = goobook.goobook:main']}
-     )
-
diff --git a/newsbeuter/cache.db b/newsbeuter/cache.db
index daf83bf..0c22be3 100644
--- a/newsbeuter/cache.db
+++ b/newsbeuter/cache.db
diff --git a/newsbeuter/cache.db.lock b/newsbeuter/cache.db.lock
index f37f2af..eafc999 100644
--- a/newsbeuter/cache.db.lock
+++ b/newsbeuter/cache.db.lock
@@ -1 +1 @@
-23888
\ No newline at end of file
+2811
\ No newline at end of file
diff --git a/screen/.batinfo.swn b/screen/.batinfo.swn
deleted file mode 100644
index 5ae58a4..0000000
--- a/screen/.batinfo.swn
+++ /dev/null
diff --git a/screen/.batinfo.swo b/screen/.batinfo.swo
deleted file mode 100644
index 4e3da68..0000000
--- a/screen/.batinfo.swo
+++ /dev/null
diff --git a/screen/.batinfo.swp b/screen/.batinfo.swp
deleted file mode 100644
index b4fc0e2..0000000
--- a/screen/.batinfo.swp
+++ /dev/null