more cleanup -- added haystack with elasticsearch engine -- needs more testing and indexing