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]
Add compatibility styles
Add forward message to job description emails [RD-97]
Fix failing tests [RD-97]
Merge pull request #94 from DirectEmployers/content-improve-copy

Improve copy on 404 and expired job templates [RD-76]
Fix unicode encoding issue [RD-99]
Merge pull request #97 from DirectEmployers/unicode-encoding

Fix unicode encoding issue [RD-99]
Merge pull request #96 from DirectEmployers/email-add-forward-message

Add forward message to job description emails [RD-97]
Added rules for saved search widget [MS-992]
Merge pull request #98 from DirectEmployers/widget-css-fix

Added rules for saved search widget [MS-992]
Merge branch 'master' into syndication-feed

Conflicts:
	redirect/views.py