This should links behave on github.. hopefully
Merge remote-tracking branch 'origin/master' into gh-pages