Fix for custom userDir + custom flowFile name

When using both custom userDir and flowFile, the userDir was ignored for the flows.json file. Also the settings.js was not ignored by github, but I believe it is user specific and should be ignored, no?
I was editing node-RED Version: 0.8.1.git