Haystack search

Hi!
I merged the current state in and made some very minor changes (see latest commits for that). I would very much like to see haystack support :)

Cheers,
Thomas