Merge pull request #202 from edmaas/pull_request

A new topology for use in son-cli profiling