Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack

Conflicts:
	telemeta/haystack_urls.py

diff --cc telemeta/forms/haystack_form.py
Simple merge

diff --cc telemeta/haystack_urls.py
index 32bee44dfb4fa9649c4ff375416d84e5fc35cc3e,35f0a27257e6deb203f7594263222361aaee3076..bcd83e44f8c5a2b0aca1eb3b0b404d181938d010
--- 1/telemeta/haystack_urls.py
--- 2/telemeta/haystack_urls.py
+++ b/telemeta/haystack_urls.py
@@@ -1,14 -1,11 +1,13 @@@
  # -*- coding: utf-8 -*-
  from django.conf.urls import patterns, url, include
  from telemeta.views.haystack_search import *
- from haystack.query import SearchQuerySet
- from haystack.views import SearchView
  from haystack.forms import *
 +from telemeta.forms.haystack_form import HaySearchFormItem, HaySearchFormCollection, HayAdvanceSearchForm
 +
  
+ 
  urlpatterns = patterns('',
      url(r'^$', HaystackSearch(form_class=HaySearchFormItem), name='haystack_search'),
-     url(r'^(?P<type>[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'),
 +    url(r'^advance/$', HaystackAdvanceSearch(form_class=HayAdvanceSearchForm), name='haystack_search_advance'),
+     url(r'^quick/(?P<type>[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'),
 -
  )