modified license for OSET
Merge branch 'master' of github.com:trustthevote/Rocky into ovr_workflow
Merge branch 'ovr_workflow' of github.com:trustthevote/Rocky into ovr_workflow
staging deploys from master
Merge branch 'master' of github.com:trustthevote/Rocky
VI locale changes, disable VI in prod/stage
vi locale fix
vi locale fix
fix vi zip code
vi fixes
no JA yet
no JA yet
Merge branch 'master' of github.com:trustthevote/Rocky into ovr_workflow