Fixed the build scripts for eclipse integration.
Added the exception source stuff
Merging conflicts