Update README.rst
locksmith changes
fix for legislator email in template
Merge branch 'master' of github.com:sunlightlabs/openstates.org
Merge branch 'master' into newdeploy