Updated master

Includes bookmarks, search, split configuration, config file location definition, and recursive content parameters (v1).