Merged revisions 20634-20635 via svnmerge from 
svn+ssh://bugman@svn.gna.org/svn/relax/trunk

........
  r20634 | bugman | 2013-08-20 16:41:30 +0200 (Tue, 20 Aug 2013) | 6 lines
  
  Changes for the spectrum.read_intensities user function dim argument.
  
  The default is now w1, the indirect dimension in a 2D experiment.  The description has also been
  fixed.
........
  r20635 | bugman | 2013-08-20 16:47:21 +0200 (Tue, 20 Aug 2013) | 3 lines
  
  Fixes for all of the peak intensity reading functions - the w1 and w2 dimensions were swapped.
........
Updated all of the dispersion system tests for the spectrum.read_intensities user function changes.

The arguments heteronuc and proton have been replaced with 'dim'.