Is there a simple tool for fixing invalid geometry in edit mode?
There is an addon called BoolTools that can help with this.  

It's a two step process.  First select the entire mesh and separate by loose parts, then union the component parts.