Merging master

diff --cc CONTRIBUTING.md
index 0000000000000000000000000000000000000000,b0305761456d95ea916294e26241e0ab53368a9e..8cf426fd1dcfcdb16cc73da9a829c494a1685bfe
mode 000000,100644..100644
--- /dev/null
--- 2/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -1,0 -1,34 +1,35 @@@
 -To contribute, fork the library and install these npm packages.
+ Submitting Issues
+ =================
+ 
+ If you are submitting a bug with moment, please create a [jsfiddle](http://jsfiddle.net/) demonstrating the issue.
+ 
+ Contributing
+ ============
+ 
 -    npm install jshint uglify-js nodeunit
++To contribute, fork the library and install grunt.
+ 
 -To run the tests, do `make test` to run all tests, `make test-moment` to test the core library, and `make test-lang` to test all the languages.
++    npm install grunt -g
+ 
+ You can add tests to the files in `/test/moment` or add a new test file if you are adding a new feature.
+ 
 -To check the filesize, you can use `make size`.
++To run the tests, do `grunt test` to run all tests.
+ 
 -To minify all the files, use `make moment` to minify moment, `make langs` to minify all the lang files, or just `make` to minfy everything.
++To check the filesize, you can use `grunt size`.
+ 
++To minify all the files, use `grunt release`.
+ 
+ If your code passes the unit tests (including the ones you wrote), submit a pull request.
+ 
+ Submitting pull requests
+ ========================
+ 
+ Moment.js now uses [git-flow](https://github.com/nvie/gitflow). If you're not familiar with git-flow, please read up on it, you'll be glad you did.
+ 
+ When submitting new features, please create a new feature branch using `git flow feature start <name>` and submit the pull request to the `develop` branch.
+ 
+ Pull requests for enhancements for features should be submitted to the `develop` branch as well.
+ 
+ When submitting a bugfix, please check if there is an existing bugfix branch. If the latest stable version is `1.5.0`, the bugfix branch would be `hotfix/1.5.1`. All pull requests for bug fixes should be on a `hotfix` branch, unless the bug fix depends on a new feature.
+ 
+ The `master` branch should always have the latest stable version. When bugfix or minor releases are needed, the develop/hotfix branch will be merged into master and released.
++

diff --cc package.json
index e8e32e687024f6830270539e7e0c01a0c84adf87,f4f189cd9c7278f11897733276a95963cfbd2dec..ae99cbd2562ed75d2d6451d54b93bc05aa6e9ba0
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -35,12 -35,12 +35,12 @@@
          }
      ],
      "devDependencies" : {
 -        "jshint"    : "latest",
          "uglify-js" : "latest",
 -        "nodeunit"  : "latest"
 +        "nodeunit"  : "latest",
-         "grunt"  : "latest"
++        "grunt"     : "latest"
      },
      "scripts": {
 -        "test": "make test"
 +        "test": "grunt"
      },
      "ender": "./ender.js"
  }

diff --cc readme.md
Simple merge