Added an additional method layer to MMM Loader so we can use input streams
Tried to fix loadDefaultModule test but it still has lots of issues
Merge remote-tracking branch 'origin/api_build' into api_build

Conflicts:
	src/test/java/edu/mines/acmX/exhibit/module_manager/ModuleManagerTest.java
More merge fixins that got left out of the previous one
Removed another one of those .orig files
Merge remote-tracking branch 'origin/api_build' into api_build