Multiple improvements and additions + bug fix

Misc changes. Specific improvements:

 * Removed extra validation check for Directory
 * state_restore now validates module version + config params
 * Added include_regex and exclude_regex options