- merge with Tai's changes

- removed cvs specific labels
- updated Jet MC smearing logic

For Volker and Tai: This version replaces pull request #1270