Merge pull request #595 from leider/master

refactored display of nicknames to use a mixin and added the link to the...
new versions of "marked" and "passport"