Nest default formats and properly merge specified formats

Closes #49
Merge pull request #50 from ericf/nested-formats

Nest default formats and properly merge specified formats