fix cukes
introducing: cancancan
Add styles to missed-yesterday email
Add styles to missed-yesterday email
merge crazy
Squashed commit of the following:

commit 7326161761f3aee4bbe0fba286444c82ca2325d2
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Jun 18 16:49:06 2014 +1200

    headlines makin the news

commit 4e35dc072559ae41e613e079b9062ce8ed2ed1e9
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Jun 18 16:34:21 2014 +1200

    makin headlines with the sweet code

commit d20a0dd7f695f51fc45761693878c904ab86b066
Author: Richard Bartlett <rich@loomio.org>
Date:   Wed Jun 18 16:14:18 2014 +1200

    vote icons working but badly

commit 9060de48267d206a2a6b4958cf3df8ed6727ffb1
Merge: 29b5f4d fa8a0ee
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Jun 18 16:11:04 2014 +1200

    Merge branch 'master' into headlines

commit 29b5f4d0078cd056a96e803a315e87336fccdc19
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Jun 18 16:07:32 2014 +1200

    partway

commit 7c8d8b7c9972495ebd7240f99b552f1c4ad6f588
Merge: b7d0712 aa57578
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Jun 18 15:42:19 2014 +1200

    Merge branch 'master' into headlines

commit b7d07129cc113e1ff734b49b1c8ff66e198dd10f
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Jun 18 15:40:14 2014 +1200

    headlines
fix specs
fix deactivated user
fix comment count bug
expose email_preference setting to users. TODO start discussion and link it
Merge pull request #1542 from loomio/yesterday-on-loomio

expose email_preference setting to users.
add discussion link on email_preferences page
Merge pull request #1541 from loomio/fix-unread-count

fix comment count bug
Add upgrades to yesterday email
Merge pull request #1539 from loomio/cancancan

introducing: cancancan
fix yesterday email bug
correct tallies on dashboard
Merge branch 'master' of github.com:loomio/loomio
fix mark all as read in yesteday email
Merge branch 'master' of github.com:loomio/loomio