Squashed commit of the following:

commit b37425993d1ece798f9a0fc106c5fd93e259634c
Author: mix irving <whimful@gmail.com>
Date:   Tue Sep 16 15:30:21 2014 +1200

    Squashed commit of the following:

    commit 599d08102450aa23ad684a3fe3c286f2ab101729
    Author: mix irving <whimful@gmail.com>
    Date:   Tue Sep 16 14:19:44 2014 +1200

        specfix

    commit 464045bd57a76031364a79aab0ce1259f3119b10
    Author: mix irving <whimful@gmail.com>
    Date:   Tue Sep 16 13:25:35 2014 +1200

        refactor sommmmmore

    commit 491184f88d66cbc9dd8016e2e402705bade0f88f
    Author: mix irving <whimful@gmail.com>
    Date:   Tue Sep 16 12:32:19 2014 +1200

        add a faster way to do comparisons?

    commit 329b01beb04fa81e8f9fc889dcef53eb49d7e3b1
    Author: mix irving <whimful@gmail.com>
    Date:   Tue Sep 16 11:46:44 2014 +1200

        final ?

    commit 1982fbff794b70b3995317d8380e6700073f726d
    Author: mix irving <whimful@gmail.com>
    Date:   Mon Sep 15 22:33:23 2014 +1200

        take out fallback ymls

    commit 2561996e6445769534faa7c11a71829d636d44b7
    Author: mix irving <whimful@gmail.com>
    Date:   Mon Sep 15 22:26:46 2014 +1200

        yucky yaml bloat

    commit 5dea740b84295bab64e4ec3520b4267bf2d17113
    Author: Robert Guthrie <rob@guthr.ie>
    Date:   Mon Sep 15 17:40:40 2014 +1200

        remove aliases

    commit a1ebec941ed0bcd9ad942b55b75f2cbd5f2063bc
    Author: mix irving <whimful@gmail.com>
    Date:   Sun Sep 14 23:22:42 2014 +1200

        tidier

    commit f091717cf4e3b3f59d4509057f8ff3b7775a771e
    Author: mix irving <whimful@gmail.com>
    Date:   Sun Sep 14 17:50:50 2014 +1200

        flop

    commit d316a9aa1fd68c6015c50e595b4ca9c89ac9c6ce
    Author: mix irving <whimful@gmail.com>
    Date:   Sun Sep 14 17:29:14 2014 +1200

        tidy

    commit 3e8ab785efbcaac152f27cdb6ff34f3e225e0951
    Author: mix irving <whimful@gmail.com>
    Date:   Sun Sep 14 15:46:03 2014 +1200

        feedback fixes

    commit 4e334fa9e7d410a5fce68f3b01cb7684ad45eede
    Author: mix irving <whimful@gmail.com>
    Date:   Sun Sep 14 15:21:53 2014 +1200

        seperate out responsibilities

    commit 4cdb04c35fa2289a6a2d672885f611041d7d7dcb
    Merge: 53ae724 408cf14
    Author: mix irving <whimful@gmail.com>
    Date:   Sun Sep 14 13:52:59 2014 +1200

        Merge branch 'master' of github.com:loomio/loomio into i18n_fallback

    commit 53ae72422eae5b9c51aef8cc26b832717d45d80d
    Author: mix irving <whimful@gmail.com>
    Date:   Tue Sep 9 11:15:22 2014 +1200

        another iteration

    commit 4963cbc22ab742a6a1e79feac4c8b0f5f773556b
    Merge: 78bcd81 cff1c25
    Author: mix irving <whimful@gmail.com>
    Date:   Mon Sep 8 16:35:30 2014 +1200

        Merge branch 'master' of github.com:loomio/loomio into i18n_fallback

    commit 78bcd815263f706d839416196f79c2c7e4a87aca
    Author: mix irving <whimful@gmail.com>
    Date:   Fri Sep 5 10:46:06 2014 +1200

        tidier fallback replacer

    commit 9a92cd30316f6cef76c643d005045bc59c97f017
    Author: mix irving <whimful@gmail.com>
    Date:   Sun Aug 24 18:02:23 2014 +1200

        i18n fallback fix
Merge pull request #1680 from loomio/fallback_v2

Fallback v2
Apply correct message id header
Merge pull request #1687 from loomio/add-message-id-brackets

Apply correct message id header
Merge branch 'master' into bootstrap3-upgrade

Conflicts:
	app/views/application/_footer_logged_in.html.haml
	app/views/users/profile.html.haml