Merged from devel tree.  Updated documentation.  Added JSON configuration file.