Merge pull request #2 from beckermr/master

added output of unweighted parameters & pure weight map options
Merge pull request #4 from beckermr/master

new features and extra flagging
ignore vim swap files
Merge pull request #3 from esheldon/master

commits from esheldon