Merge pull request #11 from uwcms/master

Merging from upstream
Merge pull request #3 from mverzett/master

Keeping promises
Update FSA
Update FSA (for real this time)
Merge branch 'master' of https://github.com/ekfriis/UWHiggs
Merge pull request #4 from mverzett/master

week-end!
bugfix
bugfix