Added test case for de/serializing meta-metadata.
Fixed whitespace.
removed unused code.
Merge branch 'master' into dev