save fluff mappings
Merge branch 'save_fluff' into view
minor bugs
save fluff mappings
Merge branch 'save_fluff' into view

Conflicts:
	ctable/models.py
	tests/test_extract.py