NPS customizations and add unit combobox
Merge branch 'master' of https://github.com/nationalparkservice/iD