Inline nickname tweaks

Add margin so that they don't break lines when they appear by themselves
Merge pull request #15 from paradox460/master

Inline nickname tweaks