Merge branch 'release/0.2.2' into develop
Changed dfp_tag to support multiple targeting keys.
Added string conversion
Removed extra spacing
PEP8
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	dfp/templatetags/dfp_tags.py
Merge pull request #1 from jpaidoussi/develop

Add multiple targeting key-value pairs
Prep for release
Merge branch 'release/0.2.3'
Merge branch 'release/0.2.3' into develop
Merge branch 'release/0.3'
Key can now also be a variable
Allow targeting keys to be variables
Prep for release
Merge branch 'release/0.3.1'
Merge branch 'master' of https://github.com/praekelt/django-dfp into merge

Conflicts:
	dfp/templatetags/dfp_tags.py