Merge pull request #72 from michaelcullum/master

Stuff
Fix up things missed in the first namespace PR
Remove testing-related files and directories.

We'll add them later. They need to be redone.
Merge pull request #74 from imkingdavid/task/namespaces

Fix up things missed in the first namespace PR
Merge pull request #75 from imkingdavid/task/removetests

Remove testing-related files and directories.
Small bits for the ACP I tidied up