Merge branch 'master' of github.com:pydanny/cookiecutter-django into feature/342

CHANGELOG.md

@@ -2,6 +2,10 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+##[2016-06-02]
+### Added
+- Added better instructions for installing postgres on Mac OS X (@dot2dotseurat )
+
 ##[2016-05-22]
 ### Added
 - Added instructions for copying backups from docker to host (@phiberjenz)

CONTRIBUTORS.rst

@@ -96,6 +96,7 @@ Listed in alphabetical order.
   Matt Linares
   Matt Menzenski           `@menzenski`_
   Matt Warren              `@mfwarren`_
+  Meghan Heintz            `@dot2dotseurat`_
   mozillazg                `@mozillazg`_
   Pablo                    `@oubiga`_
   Raphael Pierzina         `@hackebrot`_
@@ -135,6 +136,7 @@ Listed in alphabetical order.
 .. _@ChrisPappalardo: https://github.com/ChrisPappalardo
 .. _@Collederas: https://github.com/Collederas
 .. _@ddiazpinto: https://github.com/ddiazpinto
+.. _@dot2dotseurat: https://github.com/dot2dotseurat
 .. _@dsclementsen: https://github.com/dsclementsen
 .. _@epileptic-fish: https://gihub.com/epileptic-fish
 .. _@eraldo: https://github.com/eraldo

docs/installing_postgres.rst

@@ -0,0 +1,17 @@
+PostgreSQL Installation Basics
+==============================
+
+.. index:: pip, virtualenv, PostgreSQL
+
+The steps below will get you up and running with PostgreSQL. This assumes you have pip and virtualenv_ installed. 
+
+.. _virtualenv: http://docs.python-guide.org/en/latest/dev/virtualenvs/
+
+On Mac
+
+Install PostgreSQLapp_ from the browser and move PostGresSQL into your applications folder. Then install PostgreSQL from HomeBrew_.
+
+	$ brew install postgres
+
+.. _PostgreSQLapp: http://postgresapp.com/
+.. _HomeBrew: http://brew.sh/