Added appleseed settings file to gitignore
Merge remote-tracking branch 'upstream/master'
restored gitignore
Merge remote-tracking branch 'upstream/master'
fixed compilation with OSL option
removed broken OSL related classes.
Merge pull request #279 from est77/osl_branch_fix

Fixed compilation with the OSL cmake option on.