Squashed commit of the following:

commit 77e5dd8c51d2fba068ed6727eeed172aab6f50b2
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 17:05:51 2014 +1200

    escape funny uri

commit fb27708903b4db0dbccefaf35bbd3784c5c504ce
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:45:08 2014 +1200

    ok

commit 8fd92f3c76b2b58b457b1aa5780a5fa4b3d02e12
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:39:32 2014 +1200

    okokok

commit 9514e1ec97a3eebdc06e3ca15a4c0c50d48b1ab1
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:35:38 2014 +1200

    okokok

commit 66256612c9315025e8c2cdb0db12fbf71619fa77
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:31:46 2014 +1200

    ok usa

commit fed79499cf5f0410aa5ac5dd3f8cd732da5b1f02
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:22:26 2014 +1200

    usa usa usa

commit 479d7db68814b0a83512d5f99754b357f6a183b3
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:15:12 2014 +1200

    usa usa usa

commit 29301d85f333ca50b2de974a4c92046f26815a23
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 15:10:53 2014 +1200

    buh

commit 2d98564d10d27fbaa907f7dd8a462131595601a3
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 14:28:16 2014 +1200

    ok

commit 0058d82b747375ee02090feabefedc57dfc69468
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 14:23:20 2014 +1200

    uh

commit 0b770a2551ae641c605cd16bd26ae3b35e333e41
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 14:13:31 2014 +1200

    messy

commit 0eb21d9c750ce119039cd52fec3bd54977d11022
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 14:00:53 2014 +1200

    debug assets in prod

commit 9a470dbf2fa38fd8ac3d3abcc86009626859951e
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 13:54:37 2014 +1200

    debug assets in prod

commit ba1419ea77a7fccd66486a85a0d36ae3eb43ac66
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 12:52:39 2014 +1200

    fix secrets

commit 2c9afdddaea9b7f7df0f91a94f7ebd9612a4eeb7
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 12:43:20 2014 +1200

    ok

commit a7c7c3e117d269f21ffcfbde5d466d27d20de68e
Author: Robert Guthrie <rob@guthr.ie>
Date:   Mon Aug 4 12:22:08 2014 +1200

    Rails 4 upgrade - by James Kiesel and Rob Guthrie
first iteration of group metrics for admins
Merge pull request #1567 from loomio/rails-4

Upgrade to Rails 4.1
fix intercom
fix intercom
fix
skip authenticity check for themejs,css
fix
fix travis
Update show.xml.builder
Update show.xml.builder
Merge pull request #1601 from loomio/group-metrics

first iteration of group metrics for admins
Merge branch 'master' into dialects

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/unstructured/_main.css.scss
	app/mailers/discussion_mailer.rb
	app/mailers/user_mailer.rb
	app/models/concerns/is_translatable.rb
	app/views/admin/email_templates/_form.html.haml
	config/routes.rb