added gitignore
Added better json encoder for django models, that also supports haystack
Merge branch upstream into local modifications