Add tastypie, change map to maps
Finished merge