easier way to configure internals
Merge pull request #101 from lucasdupin/master

Changing only a portion of the settings
Added merge_mappings option - closes #100
drop and recreate test database