Initial Twitter cards [RD-66]
Merge branch 'master' into twitter-cards
Display solr job descriptions on Twitter card [RD-37]
Add "no job" email template [RD-93]
Send response to valid guid@my.jobs emails [RD-93]
guid@my.jobs email improvements [RD-93]

- Reorder email contents to place success message at top
- Add solr to local settings
- Add/improve tests
Add title to debug page [RD-95]
Merge pull request #91 from DirectEmployers/debug-title

Add title to debug page [RD-95]
Add .mailmap for git-shortlog
Mock solr search, replace all but prod solr with solr slave [RD-93]
Merge pull request #90 from DirectEmployers/email-redirect-phase-2

GUID email responses [RD-93]
Merge pull request #92 from DirectEmployers/add-mailmap

Add .mailmap for git-shortlog
Add pysolr to reqs
Merge pull request #93 from DirectEmployers/requirements-addition

Add pysolr to reqs
Initial expired content update [RD-76]
Merge branch 'master' into content-improve-copy

Conflicts:
	deploy/settings.sqlite.py
Improved copy on 404 page (no image) [RD-76]
Remove commented CSS [RD-76]
Use string.format instead of %-formatting [RD-76]
Add broken robot [RD-76]