Merge pull request #120 from joegazz84/master

Add two namespaces on councilwiki
fixes
Merge pull request #1 from Orain/master

Update with John's fixes to my commit