Merge branch 'master' into oxford

TODO

fsl/__init__.py

fsl/data/atlases.py

fsl/data/image.py

fsl/data/imageio.py

fsl/data/strings.py

fsl/fslview/actions/__init__.py

fsl/fslview/actions/copyimage.py

fsl/fslview/colourmaps.py

fsl/fslview/colourmaps/README

fsl/fslview/colourmaps/blue-lightblue.cmap

fsl/fslview/colourmaps/blue.cmap

fsl/fslview/colourmaps/cool.cmap

fsl/fslview/colourmaps/copper.cmap

fsl/fslview/colourmaps/green.cmap

fsl/fslview/colourmaps/greyscale.cmap

fsl/fslview/colourmaps/hot.cmap

fsl/fslview/colourmaps/order.txt

fsl/fslview/colourmaps/pink.cmap

fsl/fslview/colourmaps/random.cmap