Revamped some choppy stuff in search + added basic order search
Rename ImprintableCategory#category to #name
Added phrase filter! Works okay for has_many associations.
Merging
Allow sunspot.yml to pass through github
Merge branch 'develop' into develop-nick
Checkbox Grey png
Fixed up some stuff caught by specs
Fixed up some stuff caught by specs
Merge branch 'develop-nigel-orders-search' into develop

Conflicts:
	db/schema.rb
Merged schema
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop-david' of https://github.com/AnnArborTees/softwear-crm into develop

Conflicts:
	db/schema.rb
Fixed search form builder having issues with old session.

If an invalid query id somehow ended up in the session, search form builder would die.
Fixed bug #176, imprintable_variant_count with jobs with no line items
Removed wip from spec
Merge branch 'develop-nick' into develop

Conflicts:
	db/schema.rb
x
Fix bug #177, deleting an asset in artwork_requests via edit/update. Also removed production_name from seeds for ImprintMethod and removed repeated javascript that resides in global.js
Fix bug #171, showing artwork_requests for a given order