Some clean-up
Merge pull request #155 from SemanticMediaWiki/tidy

Some clean-up