uncrustified
pulled out mappings into categories
test cleanup
added some mapping documentation