Add merge test file from rebase tests.
Update merge tests.
Add merge commands.
Update README.md with merge docs.
Add merge task to commands.js
Merge pull request #35 from sgunturi/add-merge-task

Add merge task and tests.
Tweak Gruntfile to include jshint in test.
release 0.2.3
Require commands like the grunt task does it.

This will hopefully serve as a good guideline and prevent people from
forgetting to update lib/commands.js.