diff --git a/History.markdown b/History.markdown
index c73b9da2..979ddd1e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1358,7 +1358,7 @@
 
 ### Site Enhancements
 
-  * Add `@alfredxing` to the `@jekyll/core` team. :tada: (#3218)
+  * Add @alfredxing to the @jekyll/core team. :tada: (#3218)
   * Document the `-q` option for the `build` and `serve` commands (#3149)
   * Fix some minor typos/flow fixes in documentation website content (#3165)
   * Add `keep_files` to configuration documentation (#3162)
diff --git a/Rakefile b/Rakefile
index 51eb32ce..1a01e412 100644
--- a/Rakefile
+++ b/Rakefile
@@ -51,14 +51,8 @@ def linkify_prs(markdown)
   end
 end
 
-def linkify_users(markdown)
-  markdown.gsub(%r!(@\w+)!) do |username|
-    "[#{username}](https://github.com/#{username.delete("@")})"
-  end
-end
-
 def linkify(markdown)
-  linkify_users(linkify_prs(markdown))
+  linkify_prs(markdown)
 end
 
 def liquid_escape(markdown)
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 6d628241..85e49361 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -911,7 +911,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Bug Fixes
 {: #bug-fixes-v3-1-2}
 
-- Fix syntax highlighting in kramdown by making `[@config](https://github.com/config)` accessible in the Markdown converter. ([#4428]({{ site.repository }}/issues/4428))
+- Fix syntax highlighting in kramdown by making `@config` accessible in the Markdown converter. ([#4428]({{ site.repository }}/issues/4428))
 - `Jekyll.sanitized_path`: sanitizing a questionable path should handle tildes ([#4492]({{ site.repository }}/issues/4492))
 - Fix `titleize` so already capitalized words are not dropped ([#4525]({{ site.repository }}/issues/4525))
 - Permalinks which end in a slash should always output HTML ([#4546]({{ site.repository }}/issues/4546))
@@ -994,7 +994,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Convertible should make layout data accessible via `layout` instead of `page` ([#4205]({{ site.repository }}/issues/4205))
 - Avoid using `Dir.glob` with absolute path to allow special characters in the path ([#4150]({{ site.repository }}/issues/4150))
 - Handle empty config files ([#4052]({{ site.repository }}/issues/4052))
-- Rename `[@options](https://github.com/options)` so that it does not impact Liquid. ([#4173]({{ site.repository }}/issues/4173))
+- Rename `@options` so that it does not impact Liquid. ([#4173]({{ site.repository }}/issues/4173))
 - utils/drops: update Drop to support `Utils.deep_merge_hashes` ([#4289]({{ site.repository }}/issues/4289))
 - Make sure jekyll/drops/drop is loaded first. ([#4292]({{ site.repository }}/issues/4292))
 - Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility ([#4311]({{ site.repository }}/issues/4311))
@@ -1055,7 +1055,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation for smartify Liquid filter ([#4333]({{ site.repository }}/issues/4333))
 - Fixed broken link to blog on using mathjax with jekyll ([#4344]({{ site.repository }}/issues/4344))
 - Documentation: correct reference in Precedence section of Configuration docs ([#4355]({{ site.repository }}/issues/4355))
-- Add [@jmcglone](https://github.com/jmcglone)'s guide to github-pages doc page ([#4364]({{ site.repository }}/issues/4364))
+- Add @jmcglone's guide to github-pages doc page ([#4364]({{ site.repository }}/issues/4364))
 - Added the Wordpress2Jekyll Wordpress plugin ([#4377]({{ site.repository }}/issues/4377))
 - Add Contentful Extension to list of third-party plugins ([#4390]({{ site.repository }}/issues/4390))
 - Correct Minor spelling error ([#4394]({{ site.repository }}/issues/4394))
@@ -1436,7 +1436,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Site Enhancements
 {: #site-enhancements-v2-5-3}
 
-- Add `[@alfredxing](https://github.com/alfredxing)` to the `[@jekyll](https://github.com/jekyll)/core` team. :tada: ([#3218]({{ site.repository }}/issues/3218))
+- Add @alfredxing to the @jekyll/core team. :tada: ([#3218]({{ site.repository }}/issues/3218))
 - Document the `-q` option for the `build` and `serve` commands ([#3149]({{ site.repository }}/issues/3149))
 - Fix some minor typos/flow fixes in documentation website content ([#3165]({{ site.repository }}/issues/3165))
 - Add `keep_files` to configuration documentation ([#3162]({{ site.repository }}/issues/3162))
@@ -2033,7 +2033,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Fixed typo in datafiles doc page ([#1854]({{ site.repository }}/issues/1854))
 - Clarify how to access `site` in docs ([#1864]({{ site.repository }}/issues/1864))
 - Add closing `<code>` tag to `context.registers[:site]` note ([#1867]({{ site.repository }}/issues/1867))
-- Fix link to [@mojombo](https://github.com/mojombo)'s site source ([#1897]({{ site.repository }}/issues/1897))
+- Fix link to @mojombo's site source ([#1897]({{ site.repository }}/issues/1897))
 - Add `paginate: nil` to default configuration in docs ([#1896]({{ site.repository }}/issues/1896))
 - Add link to our License in the site footer ([#1889]({{ site.repository }}/issues/1889))
 - Add a charset note in "Writing Posts" doc page ([#1902]({{ site.repository }}/issues/1902))
@@ -2500,7 +2500,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 - Add documentation about `paginate_path` to "Templates" page in docs ([#1129]({{ site.repository }}/issues/1129))
 - Give the quick-start guide its own page ([#1191]({{ site.repository }}/issues/1191))
 - Update ProTip on Installation page in docs to point to all the info about Pygments and the 'highlight' tag. ([#1196]({{ site.repository }}/issues/1196))
-- Run `site/img` through ImageOptim (thanks [@qrush](https://github.com/qrush)!) ([#1208]({{ site.repository }}/issues/1208))
+- Run `site/img` through ImageOptim (thanks @qrush!) ([#1208]({{ site.repository }}/issues/1208))
 - Added Jade Converter to `site/docs/plugins` ([#1210]({{ site.repository }}/issues/1210))
 - Fix location of docs pages in Contributing pages ([#1214]({{ site.repository }}/issues/1214))
 - Add ReadInXMinutes plugin to the plugin list ([#1222]({{ site.repository }}/issues/1222))
@@ -2982,25 +2982,25 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-5-3}
 
 - Bug Fixes
-- Solving the permalink bug where non-html files wouldn't work ([@jeffrydegrande](https://github.com/jeffrydegrande))
+- Solving the permalink bug where non-html files wouldn't work (@jeffrydegrande)
 
 
 ## 0.5.2 / 2009-06-24
 {: #v0-5-2}
 
 - Enhancements
-- Added --paginate option to the executable along with a paginator object for the payload ([@calavera](https://github.com/calavera))
+- Added --paginate option to the executable along with a paginator object for the payload (@calavera)
 - Upgraded RedCloth to 4.2.1, which makes `<notextile>` tags work once again.
-- Configuration options set in config.yml are now available through the site payload ([@vilcans](https://github.com/vilcans))
+- Configuration options set in config.yml are now available through the site payload (@vilcans)
 - Posts can now have an empty YAML front matter or none at all (@ bahuvrihi)
 - Bug Fixes
-- Fixing Ruby 1.9 issue that requires `#to_s` on the err object ([@Chrononaut](https://github.com/Chrononaut))
-- Fixes for pagination and ordering posts on the same day ([@ujh](https://github.com/ujh))
-- Made pages respect permalinks style and permalinks in yml front matter ([@eugenebolshakov](https://github.com/eugenebolshakov))
-- Index.html file should always have index.html permalink ([@eugenebolshakov](https://github.com/eugenebolshakov))
-- Added trailing slash to pretty permalink style so Apache is happy ([@eugenebolshakov](https://github.com/eugenebolshakov))
+- Fixing Ruby 1.9 issue that requires `#to_s` on the err object (@Chrononaut)
+- Fixes for pagination and ordering posts on the same day (@ujh)
+- Made pages respect permalinks style and permalinks in yml front matter (@eugenebolshakov)
+- Index.html file should always have index.html permalink (@eugenebolshakov)
+- Added trailing slash to pretty permalink style so Apache is happy (@eugenebolshakov)
 - Bad markdown processor in config fails sooner and with better message (@ gcnovus)
-- Allow CRLFs in yaml front matter ([@juretta](https://github.com/juretta))
+- Allow CRLFs in yaml front matter (@juretta)
 - Added Date#xmlschema for Ruby versions < 1.9
 
 
@@ -3010,15 +3010,15 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Major Enhancements
 {: #major-enhancements-v0-5-1}
 
-- Next/previous posts in site payload ([@pantulis](https://github.com/pantulis), [@tomo](https://github.com/tomo))
+- Next/previous posts in site payload (@pantulis, @tomo)
 - Permalink templating system
 - Moved most of the README out to the GitHub wiki
-- Exclude option in configuration so specified files won't be brought over with generated site ([@duritong](https://github.com/duritong))
+- Exclude option in configuration so specified files won't be brought over with generated site (@duritong)
 - Bug Fixes
 - Making sure config.yaml references are all gone, using only config.yml
-- Fixed syntax highlighting breaking for UTF-8 code ([@henrik](https://github.com/henrik))
-- Worked around RDiscount bug that prevents Markdown from getting parsed after highlight ([@henrik](https://github.com/henrik))
-- CGI escaped post titles ([@Chrononaut](https://github.com/Chrononaut))
+- Fixed syntax highlighting breaking for UTF-8 code (@henrik)
+- Worked around RDiscount bug that prevents Markdown from getting parsed after highlight (@henrik)
+- CGI escaped post titles (@Chrononaut)
 
 
 ## 0.5.0 / 2009-04-07
@@ -3027,21 +3027,21 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-5-0}
 
-- Ability to set post categories via YAML ([@qrush](https://github.com/qrush))
-- Ability to set prevent a post from publishing via YAML ([@qrush](https://github.com/qrush))
-- Add textilize filter ([@willcodeforfoo](https://github.com/willcodeforfoo))
-- Add 'pretty' permalink style for wordpress-like urls ([@dysinger](https://github.com/dysinger))
-- Made it possible to enter categories from YAML as an array ([@Chrononaut](https://github.com/Chrononaut))
-- Ignore Emacs autosave files ([@Chrononaut](https://github.com/Chrononaut))
+- Ability to set post categories via YAML (@qrush)
+- Ability to set prevent a post from publishing via YAML (@qrush)
+- Add textilize filter (@willcodeforfoo)
+- Add 'pretty' permalink style for wordpress-like urls (@dysinger)
+- Made it possible to enter categories from YAML as an array (@Chrononaut)
+- Ignore Emacs autosave files (@Chrononaut)
 - Bug Fixes
-- Use block syntax of popen4 to ensure that subprocesses are properly disposed ([@jqr](https://github.com/jqr))
-- Close open4 streams to prevent zombies ([@rtomayko](https://github.com/rtomayko))
-- Only query required fields from the WP Database ([@ariejan](https://github.com/ariejan))
-- Prevent `_posts` from being copied to the destination directory ([@bdimcheff](https://github.com/bdimcheff))
+- Use block syntax of popen4 to ensure that subprocesses are properly disposed (@jqr)
+- Close open4 streams to prevent zombies (@rtomayko)
+- Only query required fields from the WP Database (@ariejan)
+- Prevent `_posts` from being copied to the destination directory (@bdimcheff)
 - Refactors
-- Factored the filtering code into a method ([@Chrononaut](https://github.com/Chrononaut))
-- Fix tests and convert to Shoulda ([@qrush](https://github.com/qrush), [@technicalpickles](https://github.com/technicalpickles))
-- Add Cucumber acceptance test suite ([@qrush](https://github.com/qrush), [@technicalpickles](https://github.com/technicalpickles))
+- Factored the filtering code into a method (@Chrononaut)
+- Fix tests and convert to Shoulda (@qrush, @technicalpickles)
+- Add Cucumber acceptance test suite (@qrush, @technicalpickles)
 
 
 ## 0.4.1
@@ -3049,9 +3049,9 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v--}
 
-- Changed date format on wordpress converter (zeropadding) ([@dysinger](https://github.com/dysinger))
+- Changed date format on wordpress converter (zeropadding) (@dysinger)
 - Bug Fixes
-- Add Jekyll binary as executable to gemspec ([@dysinger](https://github.com/dysinger))
+- Add Jekyll binary as executable to gemspec (@dysinger)
 
 
 ## 0.4.0 / 2009-02-03
@@ -3065,20 +3065,20 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-4-0}
 
-- Type importer ([@codeslinger](https://github.com/codeslinger))
-- `site.topics` accessor ([@baz](https://github.com/baz))
-- Add `array_to_sentence_string` filter ([@mchung](https://github.com/mchung))
-- Add a converter for textpattern ([@PerfectlyNormal](https://github.com/PerfectlyNormal))
-- Add a working Mephisto / MySQL converter ([@ivey](https://github.com/ivey))
-- Allowing .htaccess files to be copied over into the generated site ([@briandoll](https://github.com/briandoll))
-- Add option to not put file date in permalink URL ([@mreid](https://github.com/mreid))
-- Add line number capabilities to highlight blocks ([@jcon](https://github.com/jcon))
+- Type importer (@codeslinger)
+- `site.topics` accessor (@baz)
+- Add `array_to_sentence_string` filter (@mchung)
+- Add a converter for textpattern (@PerfectlyNormal)
+- Add a working Mephisto / MySQL converter (@ivey)
+- Allowing .htaccess files to be copied over into the generated site (@briandoll)
+- Add option to not put file date in permalink URL (@mreid)
+- Add line number capabilities to highlight blocks (@jcon)
 - Bug Fixes
-- Fix permalink behavior ([@cavalle](https://github.com/cavalle))
-- Fixed an issue with pygments, markdown, and newlines ([@zpinter](https://github.com/zpinter))
-- Ampersands need to be escaped ([@pufuwozu](https://github.com/pufuwozu), [@ap](https://github.com/ap))
-- Test and fix the site.categories hash ([@zzot](https://github.com/zzot))
-- Fix site payload available to files ([@matrix9180](https://github.com/matrix9180))
+- Fix permalink behavior (@cavalle)
+- Fixed an issue with pygments, markdown, and newlines (@zpinter)
+- Ampersands need to be escaped (@pufuwozu, @ap)
+- Test and fix the site.categories hash (@zzot)
+- Fix site payload available to files (@matrix9180)
 
 
 ## 0.3.0 / 2008-12-24
@@ -3087,19 +3087,19 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Major Enhancements
 {: #major-enhancements-v0-3-0}
 
-- Added `--server` option to start a simple WEBrick server on destination directory ([@johnreilly](https://github.com/johnreilly) and [@mchung](https://github.com/mchung))
+- Added `--server` option to start a simple WEBrick server on destination directory (@johnreilly and @mchung)
 
 ### Minor Enhancements
 {: #minor-enhancements-v0-3-0}
 
-- Added post categories based on directories containing `_posts` ([@mreid](https://github.com/mreid))
+- Added post categories based on directories containing `_posts` (@mreid)
 - Added post topics based on directories underneath `_posts`
-- Added new date filter that shows the full month name ([@mreid](https://github.com/mreid))
-- Merge Post's YAML front matter into its to_liquid payload ([@remi](https://github.com/remi))
+- Added new date filter that shows the full month name (@mreid)
+- Merge Post's YAML front matter into its to_liquid payload (@remi)
 - Restrict includes to regular files underneath `_includes`
 - Bug Fixes
-- Change YAML delimiter matcher so as to not chew up 2nd level markdown headers ([@mreid](https://github.com/mreid))
-- Fix bug that meant page data (such as the date) was not available in templates ([@mreid](https://github.com/mreid))
+- Change YAML delimiter matcher so as to not chew up 2nd level markdown headers (@mreid)
+- Fix bug that meant page data (such as the date) was not available in templates (@mreid)
 - Properly reject directories in `_layouts`
 
 
@@ -3107,13 +3107,13 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-2-1}
 
 - Major Changes
-- Use Maruku (pure Ruby) for Markdown by default ([@mreid](https://github.com/mreid))
+- Use Maruku (pure Ruby) for Markdown by default (@mreid)
 - Allow use of RDiscount with `--rdiscount` flag
 
 ### Minor Enhancements
 {: #minor-enhancements-v0-2-1}
 
-- Don't load directory_watcher unless it's needed ([@pjhyett](https://github.com/pjhyett))
+- Don't load directory_watcher unless it's needed (@pjhyett)
 
 
 ## 0.2.0 / 2008-12-14
@@ -3142,10 +3142,10 @@ note: This file is autogenerated. Edit /History.markdown instead.
 ### Minor Enhancements
 {: #minor-enhancements-v0-1-5}
 
-- Output informative message if RDiscount is not available ([@JackDanger](https://github.com/JackDanger))
+- Output informative message if RDiscount is not available (@JackDanger)
 - Bug Fixes
-- Prevent Jekyll from picking up the output directory as a source ([@JackDanger](https://github.com/JackDanger))
-- Skip `related_posts` when there is only one post ([@JackDanger](https://github.com/JackDanger))
+- Prevent Jekyll from picking up the output directory as a source (@JackDanger)
+- Skip `related_posts` when there is only one post (@JackDanger)
 
 
 ## 0.1.4 / 2008-12-08
@@ -3159,12 +3159,12 @@ note: This file is autogenerated. Edit /History.markdown instead.
 {: #v0-1-3}
 
 - Major Features
-- Markdown support ([@vanpelt](https://github.com/vanpelt))
-- Mephisto and CSV converters ([@vanpelt](https://github.com/vanpelt))
-- Code hilighting ([@vanpelt](https://github.com/vanpelt))
+- Markdown support (@vanpelt)
+- Mephisto and CSV converters (@vanpelt)
+- Code hilighting (@vanpelt)
 - Autobuild
 - Bug Fixes
-- Accept both `\r\n` and `\n` in YAML header ([@vanpelt](https://github.com/vanpelt))
+- Accept both `\r\n` and `\n` in YAML header (@vanpelt)
 
 
 ## 0.1.2 / 2008-11-22