Work on prebuild script to get django-registration to install correctly
Work to get django-registration to install correctly on dotcloud
Work to get django-registration to install correctly on dotcloud
Merge branch 'hotfix/dotcloud'

Conflicts:
	requirements/base.txt
Work to get django-registration to install correctly on dotcloud
Work to get django-registration to install correctly on dotcloud
Using dummy haystack connection on live site (we won't need it anyway)
changing to postgis database type
changing to postgis database type
Merge branch 'master' of github.com:adapt/ashtag