Add 'Last change: 2013 May 30' to headers
Merge upstream changes
Allow link nesting

Closes #58.
Merge remote-tracking branch 'upstream/master'