Merge of @burhans reorg

CHANGELOG.md

@@ -2,9 +2,13 @@
 All enhancements and patches to cookiecutter-django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2015-12-06]
+### Changed
+- Reorganization of contributors (@burhan)
+
 ## [2015-12-01]
 ### Changed
-- Update documentation to include the installation os dependecies before development requirements (@failsafe86)
+- Update documentation to include the installation os dependencies before development requirements (@failsafe86)
 
 ## [2015-11-29]
 ### Changed

CONTRIBUTORS.rst

@@ -1,82 +1,140 @@
 Code Contributors
 =================
 
-* Daniel Greenfeld *
+These contributors have commit flags for the repository,
-* a7p
+and are able to accept and merge pull requests.
-* Lukas Klein
-* Ben Lopatin
-* Bouke Haarsma
-* Agam Dua
-* Vitaly Babiy
-* Jim Munro *
-* Tom Offermann
-* Lyla Fischer
-* Taylor Baldwin
-* Chris Curvey (@ccurvey)
-* Fábio C. Barrionuevo da Luz (@luzfcb) *
-* Saurabh Kumar (gh: theskumar / @_theskumar) *
-* Ashley Camba
-* Yaroslav Halchenko
-* Pablo / @oubiga
-* Tom Atkins / @knitatoms
-* Julio Castillo / @juliocc
-* Kevin A. Stone
-* mozillazg / @mozillazg
-* Henrique G. G. Pereira / @ikkebr
-* Travis McNeill / gh: Tavistock / @tavistock_esq
-* Matt Linares
-* Russell Davies
-* Sławek Ehlert / @slafs
-* Alberto Sanchez / @alb3rto
-* Eyad Al Sibai / @eyadsibai
-* Chris Franklin
-* Benjamin Abel
-* Felipe Arruda / @arruda
-* Matt Warren / @mfwarren
-* Martin Blech
-* Andy Rose
-* Andrew Mikhnevich / @zcho
-* Kevin Ndung'u / @kevgathuku
-* Kaveh / @ka7eh
-* Alex Tsai / @caffodian
-* Garry Cairns / @garry-cairns
-* Lin Xianyi / @iynaix
-* Adam Dobrawy / @ad-m
-* Daniele Tricoli / @eriol
-* Harry Percival / @hjwp
-* Cullen Rhodes / @c-rhodes
-* Burhan Khalid / @burhan
-* Audrey Roy Greenfeld / @audreyr (and creator/maintainer of cookiecutter) *
-* Jannis Gebauer / @jayfk *
-* stepmr / @stepmr
-* Adam Bogdał / @bogdal
-* Barclay Gauld / @yunti
-* Ian Lee / @IanLee1521
-* Roman Afanaskin / @siauPatrick
-* @kaidokert
-* Raphael Pierzina / @hackebrot
-* Alvaro [Andor] / @andor-pierdelacabeza
-* Chris Franklin / @hairychris
-* Anna Callahan / @jazztpt
-* Mathijs Hoogland / @MathijsHoogland
-* Chris Pappalardo / @ChrisPappalardo
-* Amjith Ramanujam / @amjith
-* Garry Polley / @garrypolley
-* Théo Segonds / show0k
-* Cristian Vargas / @cdvv7788
-* Tom Atkins / @keybits
-* Taylor Edmiston / @tedmiston
-* Jan Van Bruggen / @jvanbrug
-* Jon Miller / @jondelmil
-* Thomas Korrison / @failsafe86
 
-\* Possesses commit rights
+=========================== ============= ===========
+Name                        Github        Twitter
+=========================== ============= ===========
+Daniel Greenfeld            `@pydanny`_   @pydanny
+Audrey Roy Greenfeld*       `@audreyr`_
+Jim Munro
+Fábio C. Barrionuevo da Luz @luzfcb
+Saurabh Kumar               `@theskumar`_ @_theskumar
+Jannis Gebauer              `@jayfk`_
+=========================== ============= ===========
+
+*Audrey is also the maintainer of cookiecutter.*
+
+.. _@pydanny: https://github.com/pydanny
+.. _@luzfcb: https://github.com/luzfcb
+.. _@theskumar: https://github.com/theskumar
+.. _@audreyr: https://github.com/audreyr
+.. _@jayfk: https://github.com/jayfk
 
 Special Thanks
-==============
+--------------
 
 The following haven't provided code directly, but have provided guidance and advice.
 
 * Jannis Leidel (django-configurations)
 * Nate Aune
 * Barry Morrison
+
+Contributors
+------------
+Listed in alphabetical order
+
+========================== ============================ ==============
+  Name                     Github                        Twitter
+========================== ============================ ==============
+  a7p                      `@a7p`_
+  Adam Bogdał              `@bogdal`_
+  Adam Dobrawy             `@ad-m`_
+  Agam Dua
+  Alberto Sanchez          `@alb3rto`_
+  Alex Tsai                `@caffodian`_
+  Alvaro [Andor]           `@andor-pierdelacabeza`_
+  Amjith Ramanujam         `@amjith`_
+  Andrew Mikhnevich        `@zcho`_
+  Andy Rose
+  Anna Callahan            `@jazztpt`_
+  Ashley Camba
+  Barclay Gauld            `@yunti`_
+  Ben Lopatin
+  Benjamin Abel
+  Bouke Haarsma
+  Burhan Khalid            `@burhan`_                   @burhan
+  Chris Curvey             `@ccurvey`_
+  Chris Franklin
+  Chris Franklin           `@hairychris`_
+  Chris Pappalardo         `@ChrisPappalardo`_
+  Cristian Vargas          `@cdvv7788`_
+  Cullen Rhodes            `@c-rhodes`_
+  Daniele Tricoli          `@eriol`_
+  Eyad Al Sibai            `@eyadsibai`_
+  Felipe Arruda            `@arruda`_
+  Garry Cairns             `@garry-cairns`_
+  Garry Polley             `@garrypolley`_
+  Harry Percival           `@hjwp`_
+  Henrique G. G. Pereira   `@ikkebr`_
+  Ian Lee                  `@IanLee1521`_
+  Julio Castillo           `@juliocc`_
+  Kaido Kert               `@kaidokert`_
+  Kaveh                    `@ka7eh`_
+  Kevin A. Stone
+  Kevin Ndung'u            `@kevgathuku`_
+  Lin Xianyi               `@iynaix`_
+  Lukas Klein
+  Lyla Fischer
+  Martin Blech
+  Mathijs Hoogland         `@MathijsHoogland`_
+  Matt Linares
+  Matt Warren              `@mfwarren`_
+  mozillazg                `@mozillazg`_
+  Pablo                    `@oubiga`_
+  Raphael Pierzina         `@hackebrot`_
+  Roman Afanaskin          `@siauPatrick`_
+  Russell Davies
+  stepmr                   `@stepmr`_
+  Sławek Ehlert            `@slafs`_
+  Taylor Baldwin
+  Théo Segonds             `@show0k`_
+  Tom Atkins               `@knitatoms`_
+  Tom Offermann
+  Travis McNeill            `@Travistock`_              @tavistock_esq
+  Vitaly Babiy
+  Yaroslav Halchenko
+========================== ============================ ==============
+
+.. _@a7p: https://github.com/a7p
+.. _@bogdal: https://github.com/bogdal
+.. _@ad-m: https://github.com/ad-m
+.. _@alb3rto: https://github.com/alb3rto
+.. _@caffodian: https://github.com/caffodian
+.. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza
+.. _@amjith: https://github.com/amjith
+.. _@zcho: https://github.com/zcho
+.. _@jazztpt: https://github.com/jazztpt
+.. _@yunti: https://github.com/yunti
+.. _@burhan: https://github.com/burhan
+.. _@ccurvey: https://github.com/ccurvey
+.. _@hairychris: https://github.com/hairychris
+.. _@ChrisPappalardo: https://github.com/ChrisPappalardo
+.. _@cdvv7788: https://github.com/cdvv7788
+.. _@c-rhodes: https://github.com/c-rhodes
+.. _@eriol: https://github.com/eriol
+.. _@eyadsibai: https://github.com/eyadsibai
+.. _@arruda: https://github.com/arruda
+.. _@garry-cairns: https://github.com/garry-cairns
+.. _@garrypolley: https://github.com/garrypolley
+.. _@hjwp: https://github.com/hjwp
+.. _@ikkebr: https://github.com/ikkebr
+.. _@IanLee1521: https://github.com/IanLee1521
+.. _@juliocc: https://github.com/juliocc
+.. _@kaidokert: https://github.com/kaidokert
+.. _@ka7eh: https://github.com/ka7eh
+.. _@kevgathuku: https://github.com/kevgathuku
+.. _@iynaix: https://github.com/iynaix
+.. _@MathijsHoogland: https://github.com/MathijsHoogland
+.. _@mfwarren: https://github.com/mfwarren
+.. _@mozillazg: https://github.com/mozillazg
+.. _@oubiga: https://github.com/oubiga
+.. _@hackebrot: https://github.com/hackebrot
+.. _@siauPatrick: https://github.com/siauPatrick
+.. _@stepmr: https://github.com/stepmr
+.. _@slafs: https://github.com/slafs
+.. _@show0k: https://github.com/show0k
+.. _@knitatoms: https://github.com/knitatoms
+.. _@Travistock: https://github.com/Tavistock