Merge branch 'master' of gitorious.codethink.co.uk:moonshot-ui/moonshot-ui