Merge branch 'master' into ballotpicker
Fix guardfile so that changes in vendor/ are discovered
Merge remote-tracking branch 'origin/master' into ballotpicker
Merge remote-tracking branch 'origin/ballotpicker' into ballotpicker
Re-order columnst to match division display, add group