Merge pull request #68 from nrem/development

Merging in newest commits from development

README.md

@@ -12,7 +12,7 @@ A detailed project page can be found [here](http://www.nrem.iastate.edu/landscap
 * Enjoy!
 
 #Collaboration
-The `master` branch is used for active development and where pull requests should be made against. [Github provides extensive documentation that explains how to collaborate.](https://help.github.com/categories/63/articles)
+PEWI uses the Git Flow method of code collaboration which means that the `development` branch is reserved for active development. All pull requests should be made against the `development` branch! The `master` branch is reserved for 'stable' releases and contains merges from `development`. Github provides extensive [documentation](https://help.github.com/categories/collaborating/) that explains how to collaborate, and there is also a step-by-step [guide](https://guides.github.com/introduction/flow/) on how to operate in the Git Flow.
 
 #Technologies
 - [jQuery](http://jquery.com/)
@@ -23,13 +23,3 @@ The `master` branch is used for active development and where pull requests shoul
 - [jsPDF](http://parall.ax/products/jspdf)
 
 Developed by the [Landscape Ecology and Sustainable Ecosystem Management Lab](http://www.nrem.iastate.edu/landscape/) in [Iowa State University Department of Natural Resource Ecology and Management](http://www.nrem.iastate.edu)
-
-
-Technologies
-----
-- jQuery (http://jquery.com/)
-- D3 (http://d3js.org/)
-- HTML5
-- CSS3
-- Colorbrewer (https://github.com/mbostock/d3/tree/master/lib/colorbrewer)
-- jsPDF (http://parall.ax/products/jspdf)

bin/outputmaps.js

@@ -820,11 +820,11 @@ var Maps = function () {
         var keys = {
             TOPOGRAPHY: {
                 label: "Slope Range",
-                0: "0%",
+                0: "0 - 1%",
                 1: "1 - 2%",
                 2: "2 - 5%",
                 3: "5 - 9%",
-                4: "0 - 14%",
+                4: "9 - 14%",
                 5: "14 - 18%",
                 length: 6
             },