Merge pull request #247 from ktf/gh-pages

Add tutorial on how to merge usercode and CMSSW.
Merge pull request #251 from ktf/gh-pages

Improve cvs diff equivalents.
Merge pull request #311 from ktf/gh-pages

Updated with feedback from William T. Ford.
Reccomend to setup $VISUAL.