Conflicts:
	fsl/data/image.py

fsl.utils.path. Featresults get*File functions use addExt instead of
glob, as it is much more robust.

having everything floating point would be a problem. Also fixed little
bug in FeatTimeSeries - overlay was being set to None.

cluster panel was trying to load ztats for contrast -1 when no cluster
results.

available.

fix this issue on all platforms.

bug (http://trac.wxwidgets.org/ticket/16440) in FSLDIRDialog.

line - previously was only applied to existing SceneOpts instances.

command-line processing to work.

killing Jalapeno

in a normal (non-VM) rendering envirnoment. So it is now only enabled
for Apple/Software renderer environments.

rendering on OSX VMs. There is a refresh issue running in a real
OS (colour texture change), and I need to update docs in gl/__init__.py.

'melodic_IC' were melodic_IC images, which they're
not (e.g. 'melodic_IC_sum')

stuff to fsl.utils.platform

module. Hopefully fixed TimeSeries confusion w.r.t. nested
.feat/.ica directories

modulateImage. More robust management of volume vs vector shader in
glvector_funcs.

from a label file. Other minor typo fixes.

code was inconsistent with regard to whether a set of labels should be
'signal' or 'noise'.