Undo changes made for #89

Better to be more explicit.

Author: mjackson

modules/components/Link.js

@@ -1,7 +1,5 @@
 var React = require('react');
 var ActiveState = require('../mixins/ActiveState');
-var ActiveStore = require('../stores/ActiveStore');
-var mergeProperties = require('../helpers/mergeProperties');
 var withoutProperties = require('../helpers/withoutProperties');
 var transitionTo = require('../helpers/transitionTo');
 var makeHref = require('../helpers/makeHref');
@@ -68,8 +66,7 @@ var Link = React.createClass({
    * Returns a hash of URL parameters to use in this <Link>'s path.
    */
   getParams: function () {
-    // Links may omit active params. See #89
-    return mergeProperties(ActiveStore.getActiveParams(), Link.getUnreservedProps(this.props));
+    return Link.getUnreservedProps(this.props);
   },
 
   /**

modules/stores/ActiveStore.js

@@ -1,5 +1,3 @@
-var mergeProperties = require('../helpers/mergeProperties');
-
 var _activeRoutes = [];
 var _activeParams = {};
 var _activeQuery = {};
@@ -70,27 +68,6 @@ var ActiveStore = {
     notifyChange();
   },
 
-  /**
-   * Returns a read-only array of the currently active routes.
-   */
-  getActiveRoutes: function () {
-    return _activeRoutes.slice(0);
-  },
-
-  /**
-   * Returns a read-only hash of the currently active params.
-   */
-  getActiveParams: function () {
-    return mergeProperties({}, _activeParams);
-  },
-
-  /**
-   * Returns a read-only hash of the currently active query parameters.
-   */
-  getActiveQuery: function () {
-    return mergeProperties({}, _activeQuery);
-  },
-
   /**
    * Returns true if the route with the given name, URL parameters, and query
    * are all currently active.