Adding django-social-auth.
Merge branch 'master' of github.com:djangocph/django-meetup
Heroku settings.
Moved requirements.txt to root.
Adding a Procfile.
Change settings module location.
Adding psycopg2.
Aaarrg paths.
Playing more with paaaths.
Trying again.
okplzthx
Moving paths around aaagain.
fuuuuuuu
Geh.
Merge branch 'master' of github.com:djangocph/django-meetup into feature/heroku

Conflicts:
	project/project/settings.py
	requirements.txt
Serve static files.
more madness.
Merge branch 'master' of github.com:djangocph/django-meetup
Merge branch 'feature/heroku'