Merge pull request #1 from jhesketh/master

Small tidy-ups, nothing major
Fix motd namespace to rcbau