Merge branch 'master' of https://github.com/SasView/sasview.git

Author: butlerpd

build_tools/jenkins_osx_build.sh

@@ -45,5 +45,5 @@ python setup.py bdist_egg --skip-build
 cd $WORKSPACE/sasview
 python setup_mac.py py2app
 
-cd $WORKSPACE/sasview/dist
-tar -czf `python -c "import pkg_resources;print '%s.tar.gz' % pkg_resources.get_distribution('sasview').egg_name()"` `python -c "import sasview; print 'SasView-%s.app' % sasview.__version__"`
+#cd $WORKSPACE/sasview/dist
+#tar -czf `python -c "import pkg_resources;print '%s.tar.gz SasView-%s.app' % (pkg_resources.get_distribution('sasview').egg_name(),pkg_resources.get_distribution('sasview').version)"`