Fix WSOD in child themes

use get_template_directory instead of get_stylesheet directory when looking for the parent theme's theme-options.php file.
Modify .gitignore for my environment
Merge remote-tracking branch 'origin/bug-fix-child-theme-wsod' into my-beta