Merge remote-tracking branch 'upstream/master' into workspace-per-session
Merge remote-tracking branch 'upstream/master'
Merge branch 'workspace-per-session'
Code cleanup
re-did code changes that may have gotten clobbered?
Merge branch 'workspace-per-session'
Somehow, binding doubled. Fixed.
Merge pull request #89 from isuftin/master

merging issues - hopefully fixed