Ordering, and resetting.
Minor cleanups
Merge remote-tracking branch 'origin/ballotpicker' into ballotpicker

Conflicts:
	templates/ballotpicker.haml
Merge branch 'ballotpicker' of github.com:belowtheline/site into ballotpicker