Better celery config
Merge branch 'develop' into feature/osf
Merge pull request #6 from fabianvf/feature/osf

Feature/osf
Update tasks.py
Updates collision detection
Merge branch 'feature/osf' of https://github.com/chrisseto/scrapi into feature/osf
No longer use .attributes
Update collision detection for resources (so it actually woks)
Pass everything as dictionaries for happiness
Add a links field to resources
Remove doc hash from resources
Add basic search tutorial (still TODO, update the fields to match the current metadata schema)