[Fixes 183] Check to make sure file isn't already open in another tab
Merge remote-tracking branch 'origin/master'