JsonDict uses JSON type in PostgreSQL; other changes
Merge branch 'master' of github.com:hasgeek/coaster

Conflicts:
	tests/test_models.py