Clean up and add Linda's changes
Merge branch 'master' of github.com:nsip/sif-data