Add 'how' values for vice presidents. Fix Johnson/Wilson merge conflict.
Merge pull request #48 from GPHemsley/vicepres

Add 'how = election|appointment' values for vice presidents. Fix Johnson/Wilson merge conflict.