Merge branch 'master' into oxford

TODO

fsl/__init__.py

fsl/data/atlases.py

fsl/data/featimage.py

fsl/data/featresults.py

fsl/data/image.py

fsl/data/imageio.py

fsl/data/model.py

fsl/data/strings.py

fsl/fslview/actions/__init__.py

fsl/fslview/actions/copyoverlay.py

fsl/fslview/actions/loadcolourmap.py

fsl/fslview/actions/openfile.py

fsl/fslview/actions/openstandard.py

fsl/fslview/actions/saveimage.py

fsl/fslview/actions/saveoverlay.py

fsl/fslview/colourmaps.py

fsl/fslview/controls/__init__.py

fsl/fslview/controls/atlasinfopanel.py

fsl/fslview/controls/atlasoverlaypanel.py