Adds service tags inline next to service names

Fixes #165

![screen shot 2014-06-06 at 3 28 30 pm](https://cloud.githubusercontent.com/assets/183418/3205012/c97b634c-edb0-11e3-8a0b-ee5c4679e55e.png)