Merge pull request #37 from uwcms/master

Merge upstream work
Merge branch 'master' of https://github.com/ekfriis/FinalStateAnalysis into svfit