Merge branch 'release/0.1.1'
Merge branch 'release/0.1.2'
Merge branch 'release/0.2'
Merge branch 'release/0.2.1'
Merge branch 'release/0.2.2'
Changed dfp_tag to support multiple targeting keys.
Added string conversion
Removed extra spacing
Add collapseEmptyDivs.
If googletag.on and jQuery are present, show the parent '.advertisement' when ad is rendered.
Move googletag signal connections to before enabling.
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