Squashed commit of the following:

commit 6bdf7ab687490bd30a8f6e215b59b5b98bdb21ef
Merge: 9eae8a0 9a5bdc7
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Feb 12 22:27:56 2014 +1300

    Merge branch 'master' into votes-perf

commit 9eae8a0a45d0aca8b367602d5c340676d44d9085
Author: john irving <whimful@gmail.com>
Date:   Wed Feb 12 14:57:17 2014 +1300

    make progress bar count votes (instead of motions)

commit cfeae93a23073c791e0d79667429a83235df4291
Author: john irving <whimful@gmail.com>
Date:   Wed Feb 12 10:50:38 2014 +1300

    add age to votes, refactor votes