use Field wrapper class for Types in Serializers
Merge branch 'develop' of github.com:mikeywaites/kim into develop

Conflicts:
	kim/mapping.py
fix circular imports