Merged dev

_coops/agile-collective.md

@@ -4,7 +4,7 @@ name: Agile Collective
 website: http://agile.coop/
 email: info@agile.coop
 twitter: AgileCollective
-github:
+github: agilecollective
 telephone: 01865 403 120
 address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4 1JE
 latitude: 51.7483161
@@ -56,5 +56,8 @@ technologies:
 Agile Collective is a small team of designers and developers who make websites for socially positive organisations such as charities, NGOs, social enterprises and educational institutions. We take a highly creative and integrated approach to all of our projects which results in a transparent and empowering working environment for the whole project team – including our client.
 
 As a socially minded company ourselves, we make every effort to contribute to our communities, minimise our environmental impact and ensure sustainability in our work practices. We organise the monthly Oxford Drupal Users Group and a couple of us run the ‘Code Club’ on a Wednesday afternoon which is aimed at inspiring young people to get into coding.
+<<<<<<< HEAD
 
+=======
+>>>>>>> dev
 There is also a company-wide obsession with cycling of various kinds.

_coops/alpha-communication.md

@@ -7,8 +7,8 @@ twitter: alpha.coop
 github: AlphaCo_op
 telephone: +441912111938
 address: 6 Charlotte Square,Newcastle upon Tyne,United Kingdom,NE1 4XF
-latitude:
-longitude:
+latitude: 54.97101
+longitude: -1.61974
 clients:
 services:
 - animation
@@ -41,5 +41,5 @@ Branding, media, print and video all working together.
 We deliver on time and within budget.
 
 KNOWING  
-After 30 years, we know what we’re doing  
+After 30 years, we know what we’re doing.  
 We help you engage with the people you need to reach.

_coops/animorph.md

@@ -3,7 +3,7 @@ title: Animorph
 name: Animorph
 website: https://animorph.coop
 email: we@animorph.coop
-twitter:
+twitter: animorphcoop
 github:
 telephone:
 address: Space4, 149 Fonthill Road,London,N4 3HF

_coops/aptivate.md

@@ -4,7 +4,7 @@ name: Aptivate
 website: http://aptivate.org/
 email: outreach@aptivate.org
 twitter: aptivateuk
-github:
+github: aptivate
 telephone: +44 (0)1223 967838
 address: 25 Signet Court, Swann's Road, Cambridge,United Kingdom,CB5 8LA
 latitude: 52.21427610000001

_coops/autonomic.md

@@ -3,7 +3,7 @@ title: Autonomic
 name: Autonomic
 website: https://autonomic.zone/
 email: autonomic-coop@posteo.net
-twitter: autonomic-coop%40posteo.html
+twitter: autonomiccoop
 github:
 telephone:
 address: 1539 Pershore Road,Stirchley,Birmingham,United Kingdom,B30 2JH

_coops/cetis-llp.md

@@ -3,7 +3,7 @@ title: Cetis LLP
 name: Cetis LLP
 website: http://www.cetis.org.uk/
 email: info@cetis.org.uk
-twitter:
+twitter: cetisllp
 github:
 telephone: 07366025747
 address: Halton Mill,Mill Lane,Halton,Lancaster,England,LA2 6ND

_coops/chapel-street-studio.md

@@ -3,7 +3,7 @@ title: Chapel Street Studio
 name: Chapel Street Studio
 website: http://chapelstreetstudio.coop/
 email: info@chapelstreetstudio.coop
-twitter:
+twitter: chapelststudio
 github:
 telephone: 07743 426 846 (Martyn Johnston | Secretary)
 address: Chapel Street Studio,Assembly Bradford, Market Pavilion, Rawson Place,Bradford,West Yorkshire,BD1 3QQ

_coops/creative-coop.md

@@ -2,10 +2,10 @@
 title: Creative Coop
 name: Creative Coop
 website: https://creative.coop
-email:
+email: hello@creative.coop
 twitter:
 github:
-telephone: 01274574147
+telephone: 01206 574147
 address: 2 Balkerne House, Balkerne Passage,Colchester,United Kingdom,CO1 1PA
 latitude: 51.89010188809361
 longitude: 0.8957915683888586

_coops/outlandish.md

@@ -3,8 +3,8 @@ title: Outlandish
 name: Outlandish
 website: http://www.outlandish.com
 email: hello@outlandish.com
-twitter: outlandishideas
-github: hello%40outlandish.html
+twitter: outlandish
+github: outlandishideas
 telephone: +44 (0) 207 561 9968
 address: 3rd Floor,149 Fonthill Road,Finsbury Park,London,United Kingdom,N4 3HF
 latitude: 51.56372160000001
@@ -19,6 +19,7 @@ clients:
 - european-union
 - gender-action-for-peace-and-security
 - goethe-institut
+- greenpeace
 - hachette-uk
 - hotwire-pr
 - indie-training-fund