Merge branch 'master' into django-1.4
Use project templates
Merge pull request #3 from nanonyme/master

Splitted requirements files in a directory
Merge pull request #4 from nanonyme/master

Use the new templating from Django 1.4
Updating our Heroku run command for Django 1.4.
Removing HEROKU_STACK option.

Cedar is the new default, no need for this.
Removing our env.settings global.

This is no longer needed thanks to Django 1.4.
Updating our default Heroku addons.

We'll now install, by default (if you don't change anything):

    - CloudAMQP (for messaging)
    - Heroku PostgreSQL (for database)
    - Heroku scheduler (for cron)
    - Memcache (for caching)
    - New Relic (for application monitoring and troubleshooting)
    - PostgreSQL backups (for data security)
    - Sentry (for error alerts)

By default, we'll install the free version of each of these addons--so that you
won't pay anything.
Adding support to set environments on heroku, using fabfile
Merge pull request #15 from pydanny/patch-1

Updating the Django version
Merge pull request #17 from pydanny/master

South update
Merge branch 'master' of github.com:rdegges/django-skel

* 'master' of github.com:rdegges/django-skel:
  Updating the South version.
  Update reqs/prod.txt
  Updating the Django version
Merge pull request #19 from hirokiky/master

heroku config:add with Fabric
Merge ../django-skel
stuff for passenger, HTML5 boiler plate, and LESS
a few setting tweaks, updating vertical rhythm
adding development URLs