Inline nickname tweaks

Add margin so that they don't break lines when they appear by themselves

![screen shot 2014-10-24 at 5 06 16 pm](https://cloud.githubusercontent.com/assets/168193/4778002/c712c86e-5bda-11e4-92b7-fa254bd164f5.png)