Merge pull request #2 from unitedstates/master

Merge from EFF
Change incorrect $SUBJECT labels to $TOPIC
Don't require address street 2
Merge pull request #1301 from NGPVAN/master

Fix topic selector value label