fixes issue in merge() action with OneToOneField
django 1.6 compat
updates export_as_csv() api to handle multiple writers
updates doc
updates travis
updates Makefile