Merge pull request #11 from uwcms/master

Merging from upstream
Update FSA
Update FSA (for real this time)
Merge branch 'master' of https://github.com/ekfriis/UWHiggs