Merge pull request #82 from mor1/master

rationalising feeds and permalinks
add infoq rwo article
Merge pull request #84 from avsm/master

add infoq rwo article
Add infoworld article
Merge pull request #85 from avsm/master

Add infoworld article
wiki: fix broken permalink (don't need `.md` extension on the permalink...)