Update to account for duplicates
Merge branch 'master' of https://github.com/saltastro/pysalt