Squashed commit of the following:

commit 2ba2f0e4ec13edd50a302fc56898bfcf555343ea
Merge: baef1b4 1832f78
Author: john irving <whimful@gmail.com>
Date:   Fri Oct 11 10:40:16 2013 +1300

    Merge branch 'master' of github.com:loomio/loomio into feature/print-button

    Conflicts:
    	Gemfile
    	Gemfile.lock
    	app/views/comments/_comment_likes.html.haml
    	app/views/layouts/application.html.haml
    	config/routes.rb

commit baef1b49f407bb513f7f4c564128396d335234a1
Author: honor <katalina@voteseed.com>
Date:   Thu Oct 10 09:57:47 2013 -0400

    remove references to pdfkit

commit c766a6e94e64ad29b4569aa0d689a6928f29316b
Author: honor <katalina@voteseed.com>
Date:   Fri Oct 4 01:46:02 2013 -0400

    dates show correctly on everything but discussion

commit 67693ddad7bf63d9bbd9ec01476c295f3d133dde
Author: honor <katalina@voteseed.com>
Date:   Fri Oct 4 00:09:44 2013 -0400

    small stylings

commit 44a95134e2019a440192e66674a6a02afc6b0647
Author: honor <katalina@voteseed.com>
Date:   Thu Oct 3 23:46:43 2013 -0400

    layouts/print view created

commit 18591de172c7cc90f4d8977698f5d6c0b5556fd1
Author: honor <katalina@voteseed.com>
Date:   Thu Oct 3 22:56:33 2013 -0400

    motions listed in better detail

commit 5084ae52282cf14a503c4808374e4d3ba67ac05b
Author: honor <katalina@voteseed.com>
Date:   Thu Oct 3 22:52:41 2013 -0400

    gemfile cleaned up

commit 2689bf27e8748ccc58a423c53977d159dd588176
Author: honor <katalina@voteseed.com>
Date:   Thu Oct 3 22:50:42 2013 -0400

    remove likes

commit 75504d6160fcfbb38ba13400524815b43577e7c2
Author: honor <katalina@voteseed.com>
Date:   Thu Oct 3 17:49:11 2013 -0400

    proposals full view

commit 0822a8fad542c927dfa43e273d3d652f43f6942e
Author: honor <katalina@voteseed.com>
Date:   Thu Oct 3 16:49:16 2013 -0400

    context, comments, discussion ordered

commit 15887583d1c7debba42b0cd0380d5a9a4bf1a87c
Author: honor <katalina@voteseed.com>
Date:   Fri Sep 27 02:15:46 2013 -0400

    Print view cleaned up, still needs some styling

commit 395e67b4b1ebdf831bc55c5a07b429c05d5ef975
Author: honor <katalina@voteseed.com>
Date:   Wed Sep 25 01:02:51 2013 -0400

    Edit discussion context link removed from show_print view

commit 9fe041993c70f0edbd82c0bc40de392427f6b549
Author: honor <katalina@voteseed.com>
Date:   Tue Sep 24 23:53:17 2013 -0400

    Print view first cleanup

commit ec14812918ba2dd3d96b2196a740303c6b99b729
Merge: 7389527 d612e0f
Author: john irving <whimful@gmail.com>
Date:   Tue Sep 24 18:14:07 2013 +1200

    Merge branch 'master' of github.com:loomio/loomio into feature/print-button

commit 73895270f00d7d6390def561a87f6c1c68a401ac
Author: honor <katalina@voteseed.com>
Date:   Mon Sep 23 18:35:12 2013 -0400

    .pdf extension renders a printable form

commit d4578f7b43a33fa755e37897ca9353d82a88050d
Author: john irving <whimful@gmail.com>
Date:   Fri Sep 20 16:15:14 2013 +1200

    update languages, promote catalan to an experimental language

commit 267ae4418070ea9a1e90a5b79c0732b39d1d9d6b
Author: john irving <whimful@gmail.com>
Date:   Fri Sep 20 16:00:43 2013 +1200

    fix failing translation bug for spanish

commit bb35ac69c7bc97c5d9925c0c9a83da93924760ba
Author: Hannah Salmon <hr.salmon@gmail.com>
Date:   Fri Sep 20 15:13:49 2013 +1200

    fix admin updates payment plan bug

commit 563b9ec27837e943fb43c830c01d29bfb79f714b
Author: john irving <whimful@gmail.com>
Date:   Thu Sep 19 17:17:14 2013 +1200

    reduce segmentio functionlity so it works at least in part

commit 36a1708bcfcf621e07b04380dd710ea1a7f824a7
Author: Richard Bartlett <rich@loomio.org>
Date:   Thu Sep 19 14:56:44 2013 +1200

    enliven a couple new languages

commit 38cac7f9aeb5945d4a141ee8602264002e1ea0ee
Author: Hannah Salmon <hr.salmon@gmail.com>
Date:   Thu Sep 19 10:37:57 2013 +1200

    replace contact links with links to form

commit 66ce834393681d74ec8a5b8355fda6ac215b3333
Author: Robert Guthrie <rob@guthr.ie>
Date:   Thu Sep 19 10:55:25 2013 +1200

    fixes reader race conditions

commit fd51b7c5041a0ea5e4f5f7a8565fbf256aed823a
Author: Robert Guthrie <rob@guthr.ie>
Date:   Thu Sep 19 10:24:44 2013 +1200

    fix no method reject for nil when updating inbox preferences

commit 4daaea24252eea3845d5e8bebf18d57f7e4b492b
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Sep 18 17:53:20 2013 +1200

    disable segmentio

commit ad71487e2d0fb5e699025bde764c81d5f3970749
Author: Jon Lemmon <jon@loomio.org>
Date:   Wed Sep 18 14:23:59 2013 +1200

    Fix social meta tagline

commit bfb833610bf1990ddbcf873e5f1a20cdf7fa7a1b
Author: john irving <whimful@gmail.com>
Date:   Wed Sep 18 18:01:49 2013 +1200

    rebase ok?

commit e9c3530c71e0866964a2d9d35d43768ea3fbea6d
Author: honor <katalina@voteseed.com>
Date:   Wed Sep 18 00:21:29 2013 -0400

    Print button graphic, no link yet

commit 4f074612e5608f4e42c8a6bafede1b2af1474cfa
Author: honor <katalina@voteseed.com>
Date:   Tue Sep 17 23:36:46 2013 -0400

    Print button start

commit 14046bef92af1744320c347428c43a6cbac9ddae
Author: honor <katalina@voteseed.com>
Date:   Mon Sep 16 17:14:05 2013 -0400

    Start of print show_print view