Squashed commit of the following:

commit 456263b39acbf768c7497612422f18a29a003268
Author: Robert Guthrie <rob@guthr.ie>
Date:   Wed Mar 12 12:33:41 2014 +1300

    fix cuke

commit 993d82bc99728a46b54495182422ffb123fa2b01
Merge: 9cb2371 6b7ecfd
Author: Robert Guthrie <rob@guthr.ie>
Date:   Tue Mar 11 15:37:57 2014 +1300

    Merge branch 'master' into crowdfunding_banner

    Conflicts:
    	app/assets/stylesheets/frontpage.css
    	app/views/layouts/pages.html.haml

commit 9cb2371a7996a091c9de8be8c597454855da6c59
Author: john irving <whimful@gmail.com>
Date:   Tue Mar 4 15:32:31 2014 +1300

    add back end logic and update color

commit b232f3b142f1184f2fc16de5a6305394777745e4
Merge: 5e0a22c fd4bf57
Author: Robert Guthrie <rob@guthr.ie>
Date:   Tue Mar 4 12:09:44 2014 +1300

    Merge branch 'master' into crowdfunding_banner

commit 5e0a22c59106ab8602652ead954c6f4e3fe13337
Merge: 9945c0b 9b205ec
Author: Robert Guthrie <rob@guthr.ie>
Date:   Tue Mar 4 11:55:13 2014 +1300

    jesse make work

commit 9945c0b5ee796240f1e5966021cc20de55f1e15b
Author: Jesse Doud <jessedoud@gmail.com>
Date:   Wed Feb 19 13:40:53 2014 +1300

    add banner