added hstor to database and deleted a bunch of files
merge conflict in enviroments for jango