Merge branch 'master' into stable

Author: desilinguist

conda-recipe/unix/rsmtool/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: rsmtool
-  version: 5.0.0
+  version: 5.0.1
 
 source:
   path: ../../../../rsmtool

conda-recipe/windows/rsmtool/meta.yaml

@@ -1,6 +1,6 @@
 package:
   name: rsmtool
-  version: 5.0.0
+  version: 5.0.1
 
 source:
   path: ../../../../rsmtool

doc/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes
 
+## v5.0.1 (June 7, 2016)
+
+### Bugfixes
+
+* RSMCompare now does not switch the old and new experiments in the report.
+
 ## v5.0.0 (June 3, 2016)
 
 ### New features

rsmtool/notebooks/comparison/header.ipynb

@@ -469,7 +469,7 @@
    },
    "outputs": [],
    "source": [
-    "def combine_old_new_results(df_new, df_old, name):\n",
+    "def combine_old_new_results(df_old, df_new, name):\n",
     "    \n",
     "    # combine the two dataframes and compute the difference\n",
     "    df_diff = df_new - df_old\n",

rsmtool/version.py

@@ -3,5 +3,5 @@
 in one place. Based on the suggestion `here. <http://bit.ly/16LbuJF>`_
 """
 
-__version__ = '5.0.0'
+__version__ = '5.0.1'
 VERSION = tuple(int(x) for x in __version__.split('.'))