Add :short_year to url_placeholders
Add short_year description to /docs/permalinks/
Merge pull request #2301 from TheTomThorogood/short_year_permalink