Initial Twitter cards [RD-66]
Merge branch 'master' into twitter-cards
Display solr job descriptions on Twitter card [RD-37]
Merge branch 'master' into twitter-cards

Conflicts:
	deploy/settings.sqlite.py
	deploy/settings.staging.py
	redirect/tests/views.py
	requirements.txt
Search for correct test in response content [RD-37]
Remove unused solr variable [RD-37]
Add defaults for old jobs not in Solr [RD-37]
Update twitter template to say My.jobs [RD-37]
Update opengraph template to reference My.jobs [RD-37]
Add custom parameters when redirecting from a feed [RD-105]
Merge pull request #103 from DirectEmployers/feed-redirect-custom-params

Add custom parameters when redirecting from a feed [RD-105]
Merge pull request #101 from DirectEmployers/twitter-cards

Twitter Cards [RD-37]
Merge branch 'master' into use-guid-in-redirects

Conflicts:
	redirect/helpers.py