Added Mathematica package to import BOUT++ data. To use:

 - Add 'AppendTo[$Path,"<full_path_to_BOUT>/tools/mathematicalib"]' to /home/jto500/.Mathematica/Kernel/init.m
 - Call 'Import["BoutCollect.m"]' in Mathematica

Then you can use e.g. 'f=BoutCollect[variable,path->"data"]' or 'f=BoutCollect[variable,path->"data"]'. 'bc' is a shorthand for 'BoutCollect\. All options supported by the Python collect() function are included, though Info does nothing yet.
Bugfixes to BoutCollect.m
Merging John's Mathematica collect routine
Added Mathematica collect routine to user manual
Merge branch 'master' of git://github.com/bendudson/BOUT

Conflicts:
	src/invert/laplace/impls/mumps/mumps_laplace.cxx