Some fixes for http://jira.diamond.ac.uk/browse/DAWNSCI-546
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git