Squashed commit of the following:

commit 2ce86b7284d73343118f22771303fb49375c97a8
Author: Dan Haber <handaber@gmail.com>
Date:   Fri Dec 21 15:15:59 2012 -0800

    --amend

commit 8d2272b9983a9a2810e6c33da2da02294b5c69ff
Author: Dan Haber <handaber@gmail.com>
Date:   Fri Dec 21 15:14:18 2012 -0800

    --amend

commit 2abf40a26d603a78fc4fa9629fa8257c64e99a93
Author: Dan Haber <handaber@gmail.com>
Date:   Fri Dec 21 15:11:55 2012 -0800

    --amend

commit c85bc69aef2506189a5ee199ae72eab35b8357c4
Author: Dan Haber <handaber@gmail.com>
Date:   Fri Dec 21 15:09:29 2012 -0800

    --amend

commit 875a4220c3cc5aabd2e9bf7309954cf0060619d1
Author: Dan Haber <handaber@gmail.com>
Date:   Fri Dec 21 15:05:15 2012 -0800

    --amend

commit bcb95722683671a3ab1b67e15a7cea7b44c90d05
Author: Dan Haber <handaber@gmail.com>
Date:   Fri Dec 21 15:00:56 2012 -0800

    --amend

commit b12627f3d0d9d020d77dfb0dcc4212580ef26638
Author: Dan Haber <handaber@gmail.com>
Date:   Fri Dec 21 14:54:15 2012 -0800

    add searchtype=t

commit 1bdf7c0ebcdb54a074af69ac142d8472fbe867ef
Author: Dan Haber <handaber@gmail.com>
Date:   Fri Dec 21 14:52:09 2012 -0800

    add cl.srch.listings.xml
Squashed commit of the following:

commit 7bfcd4ff8d0d6806d552d866eaec10f5608a5649
Author: James Broad <jb@carbonsilk.com>
Date:   Sat May 30 22:50:23 2009 +0100

    Adding Yahoo! Answers API
Pulling stuff from sh1mmer/yql-tables

Conflicts:
	regex/regex.xml