Fixes #211 Exported files not refreshed when modified outside Eclipse
Refactor the builder logic to make it a bit easier to follow
Fixes for #212 Handle file renames while an editor is open

* also remove some discrepancies with how the language service is
handled between the reconciler and editor - they should both operate in
a similar fashion
* this may also fix the issue with random occurrence markers appearing
to be off (renaming can cause that issue as well)
Merge remote-tracking branch 'origin/master' into develop