Removes double requirement
Fixing requirements to include pillow instead of pil and removing old tastypie
Fixing conflicts in requirements
Merge pull request #229 from ciudadanointeligente/dev

Updating requirements