make marmalade a link
make jabberel a link
blog link instead of roll
reorg a bit