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

This was done as per our irc convo rev but still needs testing