Brough module up to date with latest changes from skidz joomla and aurora webui

This should be uptodate as per our irc discussion rev but still needs testing.