Fixed file save issue where NoneType exception was raised on None file...

...system watcher

Most of the diff is indentation fixes.  The main fix though is that of resolving the None file system watcher on "Save File As" actions (it was not possible to create a new file and save it).  I will add comments on the relevant lines to make the code review easier.