db updates
Merge branch 'master' of https://github.com/simdugas/childcare into rickey

Conflicts:
	models/db.py
now on postgres with golocations working
Merge pull request #6 from simdugas/rickey

Rickey- geolocations are going in!