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 :)

Now it works correctly!

Let me know if you will look over it again, or not. In case you don't have the time I will do it.

Cheers,
Thomas