Merge pull request #14 from uwcms/master

Merge upstream work
Merge branch 'master' of https://github.com/ekfriis/UWHiggs
a few minor updates
fixed small bug in combined fr comparison mass plots
Merge pull request #21 from scooperstein/master

a few updates