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