Merge pull request #2 from BusProject/pollvault-integration

Pollvault integration
Small fixes to fork additions, block order fix
Added order to attr_accessable
Added new state for different left-hand sidebar options
Minor wording change
Added guide names to title bars
remove old guides functionality that breaks on geolocation
protect against nil pollvault
Merge branch 'master' of github.com:radicaldesigns/Ballot
Merge branch 'master' of github.com:BusProject/Ballot