Fixed Category problem.
Merge branch 'master' of https://github.com/cfengine/documentation
Fixed more category and naming problems.
Merge pull request #385 from KevWright/fixed-more-stuff

Fixed more category stuff