Creating template
Merge branch 'master' of github.com:appsembler/paasbakeoff
rename wsgi.py to wsgi/application and add the openshift specific stuff
Merge remote-tracking branch 'paasbakeoff/openshift'

Conflicts:
	wsgi/application
add the openshift database url

not unlike the one that stackato or heroku uses
ignore mac hidden files
openshift doesn't use a requirements file, so we have to make a setup.py
Merge remote-tracking branch 'paasbakeoff/openshift'

Conflicts:
	.gitignore
	setup.py
adding steps for the deploy

as documented here:
https://openshift.redhat.com/community/forums/openshift/problems-deployi
ng-django-postgres-as-scalable-app
need to look for the requirements.txt from the repo root
simplify the package installing
forgot to import os and urlparse
it seems that APP_DIR is deprecated, so using OPENSHIFT_HOMEDIR instead
d'uh. trying to use python in a bash script
make mywebsite importable
serve up the static files from wsgi/static
don't need two bin/activates
make the collectstatic less verbose
create a media dir and symlink link it to the static dir
remove the double slashes