Merge branch 'release/v1.1'
Merge branch 'master' of github.com:youngrewiredstate/pyrosite
Merging release/v1.1.1 into master

commit c3dd8e4099c60c40c8d29f75048e31e99d69d3d3
Author: Jamie Hurst <jamie@jamiehurst.co.uk>
Date:   Mon Mar 18 20:55:05 2013 +0000

    Version is at v1.1.1

commit 3f2af3c5bf7f5b73bef5a346d63905d313e95829
Author: Jamie Hurst <jamie@jamiehurst.co.uk>
Date:   Mon Mar 18 20:52:17 2013 +0000

    Adding logging for the evens

commit 2b2208b87db436f2fee1769d797e70f0b084a582
Author: Jamie Hurst <jamie@jamiehurst.co.uk>
Date:   Mon Mar 18 20:23:18 2013 +0000

    Adding changes for emails in events

commit 88889fad3ba43783168c047bbcd4679233099f4a
Author: Jamie Hurst <jamie@jamiehurst.co.uk>
Date:   Mon Mar 18 20:18:43 2013 +0000

    Replacing all square images with new logo

commit f08c23e34cef6d2def0b4cb102984be12d6e646d
Author: Jamie Hurst <jamie@jamiehurst.co.uk>
Date:   Mon Mar 18 20:15:16 2013 +0000

    Remove broken foc@ email address

commit b78bcf50e74c3ac0830c0c838fd847e9353c7155
Merge: 5e3f418 446c114
Author: Adam McGreggor <adam@amyl.org.uk>
Date:   Thu Mar 14 11:26:41 2013 +0000

    Merge branch 'develop' of github.com:youngrewiredstate/pyrosite into develop

commit 5e3f418c40fccbbff0204e30e715e71ce4f2af2a
Author: Adam McGreggor <adam@amyl.org.uk>
Date:   Thu Mar 14 11:24:40 2013 +0000

    Use Moneypenny number.

    Update the database to store the Moneypenny number/copy, as it seems
    to be stored there, and we want it to continue amongst deployments.

    I'm uneasy about CONTENT being stored in the repository, as it leaves
    things in a messy state, to my mind.

    Hopefully, this works, as it's taken from production -> repo.

commit 8d01b54e408d1a5cb12f4baf7c0e093afb4c1f41
Merge: 85256b8 102dbb1
Author: Adam McGreggor <adam@amyl.org.uk>
Date:   Tue Mar 12 13:55:48 2013 +0000

    Merge branch 'release/v1.1' into develop
Merge remote-tracking branch 'origin/develop'
Merge branch 'master' of github.com:youngrewiredstate/pyrosite

Conflicts:
	db/036-fixnunmber.sql
Merge remote-tracking branch 'origin/develop'
Update version to v1.1.2
Merge branch 'release/v1.1.2'

Conflicts:
	VERSION
Fix event confirmation emails
Merge branch 'hotfix/confirmation-emails' into develop