diff --git a/.gitignore b/.gitignore
index 63239723..6cb2271d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,11 @@ config.status.*
 config_*.mk
 object_*
 io_src
+swig
 lib_Linux_*
 lib_Darwin_*
 *.lex.c
 *.tab.c
 *.tab.h
 *.swp
+Makefile_jsc_dirs
diff --git a/Makefile b/Makefile
index 406df377..8c4eed24 100644
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,7 @@ ICG_EXE := ${TRICK_HOME}/trick_source/codegen/Interface_Code_Gen/ICG_$(shell una
 ################################################################################
 # DEFAULT TARGET
 # 1 Build Trick-core and Trick Data-products.
-all: no_dp dp
+all: no_dp dp java
 	@ echo ; echo "Trick compilation complete:" ; date
 
 #-------------------------------------------------------------------------------
@@ -187,13 +187,13 @@ $(ER7_UTILS_DIRS): TRICK_CXXFLAGS += -Wno-unused-parameter
 $(ER7_UTILS_DIRS): make_er7_makefiles icg_sim_serv
 	@ $(MAKE) -C $@ trick
 
-ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1)
 .PHONY: make_er7_makefiles
 make_er7_makefiles:
 	@for i in $(ER7_UTILS_DIRS) ; do \
 	   $(CP) ${TRICK_HOME}/trick_source/sim_services/Executive/Makefile $$i; \
 	done
 
+ifeq ($(USE_ER7_UTILS_INTEGRATORS), 1)
 icg_sim_serv: | make_er7_makefiles
 endif
 
@@ -282,7 +282,7 @@ sim_test:
 ################################################################################
 
 
-clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG
+clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG clean_java
 	@/bin/rm -rf $(TRICK_BIN_DIR)
 	@/bin/rm -rf $(TRICK_LIB_DIR)
 
@@ -515,3 +515,5 @@ ICG: $(ICG_EXE)
 trick_lib:
 	${TRICK_CPPC} $(SHARED_LIB_OPT) -o $(TRICK_LIB) $(SIM_SERV_OBJS) $(ER7_UTILS_OBJS) $(UTILS_OBJS) $(SWIG_OBJS)
 
+# For NASA/JSC developers include optional rules
+-include Makefile_jsc_dirs
diff --git a/bin/java/.gitignore b/bin/java/.gitignore
new file mode 100644
index 00000000..aacedf9f
--- /dev/null
+++ b/bin/java/.gitignore
@@ -0,0 +1,2 @@
+dist
+resources
diff --git a/bin/java/lib/.gitignore b/bin/java/lib/.gitignore
new file mode 100644
index 00000000..c43b701f
--- /dev/null
+++ b/bin/java/lib/.gitignore
@@ -0,0 +1,2 @@
+*.jar
+
diff --git a/configure b/configure
index 35bd87e3..5c53438d 100755
--- a/configure
+++ b/configure
@@ -30,8 +30,6 @@ gtest=""
 motif=""
 hdf5=""
 dmtcp=""
-er7_utils=""
-fermi_ware=""
 dmtcp_min_ver=1.2.4
 tprocte=""
 bc635=""
@@ -258,14 +256,6 @@ do
            prev=dmtcp ;;
        --dmtcp=*)
            dmtcp=$optarg ;;
-       --er7-utils)
-           prev=er7_utils ;;
-       --er7-utils=*)
-           er7_utils=$optarg ;;
-       --fermi-ware)
-           prev=fermi_ware ;;
-       --fermi-ware=*)
-           fermi_ware=$optarg ;;
        --flex | --lex)
            prev=flex ;;
        --flex=* | --lex=*)
@@ -685,7 +675,7 @@ fi
 # If this TRICK_HOME is from our repository.
 if [ -e "$TRICK_HOME/.git" -o $dev == 1 ] ; then
 
-    echo "Trick subversion repository detected. Additional developer configuration continuing"
+    echo "Trick development repository detected. Additional developer configuration continuing"
 
     # go ahead and set dev to 1.
     dev=1
@@ -836,8 +826,6 @@ GTEST_HOME = $gtest
 
 LIBXML = $libxml
 MOTIF_HOME = $motif
-FERMI_WARE_HOME = $fermi_ware
-ER7_UTILS_HOME = $er7_utils
 
 # experimental, default to 0
 HAVE_ZEROCONF = 0
diff --git a/makefiles/Makefile.common b/makefiles/Makefile.common
index 66c4659c..f63d420f 100644
--- a/makefiles/Makefile.common
+++ b/makefiles/Makefile.common
@@ -81,10 +81,11 @@ TRICK_CXXFLAGS += -DHAVE_ZEROCONF
 endif
 
 export USE_ER7_UTILS_INTEGRATORS := 0
-ifneq ("$(wildcard $(ER7_UTILS_HOME))","")  # if the er7_utils directory exists
+ifneq ("$(wildcard $(TRICK_HOME)/trick_source/er7_utils)","")  # if the er7_utils directory exists
+  ER7_UTILS_HOME := $(TRICK_HOME)/trick_source/er7_utils
   USE_ER7_UTILS_INTEGRATORS := 1
-  TRICK_CFLAGS += -DUSE_ER7_UTILS_INTEGRATORS -I${ER7_UTILS_HOME}/..
-  TRICK_CXXFLAGS += -DUSE_ER7_UTILS_INTEGRATORS -I${ER7_UTILS_HOME}/..
+  TRICK_CFLAGS += -DUSE_ER7_UTILS_INTEGRATORS
+  TRICK_CXXFLAGS += -DUSE_ER7_UTILS_INTEGRATORS
 endif
 
 endif #TRICK_MAKE_COMMON
diff --git a/trick_sims/.gitignore b/trick_sims/.gitignore
index 0a145c74..1109228b 100644
--- a/trick_sims/.gitignore
+++ b/trick_sims/.gitignore
@@ -7,3 +7,18 @@ varserver_log
 log_*
 chkpnt_*
 MONTE_RUN_*
+.S_library*
+.icg_no_found
+CP_out
+MAKE_out
+Makefile_sim
+Makefile_swig
+S_default.dat
+S_document.xml
+S_library_list
+S_main_*
+S_sie.resource
+S_source.cpp
+S_source.hh
+trick
+
diff --git a/trick_source/.gitignore b/trick_source/.gitignore
new file mode 100644
index 00000000..32e7b8d7
--- /dev/null
+++ b/trick_source/.gitignore
@@ -0,0 +1 @@
+er7_utils
diff --git a/trick_source/data_products/.gitignore b/trick_source/data_products/.gitignore
new file mode 100644
index 00000000..6b55aac5
--- /dev/null
+++ b/trick_source/data_products/.gitignore
@@ -0,0 +1 @@
+fermi-ware
diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/makefile b/trick_source/data_products/DPX/APPS/FXPLOT/makefile
index 3ed7da31..529acc26 100644
--- a/trick_source/data_products/DPX/APPS/FXPLOT/makefile
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/makefile
@@ -11,7 +11,7 @@ DPX_DIR = ../..
 
 CFLAGS = -g -Wall
 
-INCDIRS = -I${DPX_DIR} -I../../.. -I/usr/include/libxml2 -I$(MOTIF_HOME)/include -I$(FERMI_WARE_HOME)
+INCDIRS = -I${DPX_DIR} -I../../.. -I/usr/include/libxml2 -I$(MOTIF_HOME)/include -I$(TRICK_HOME)/trick_source/data_products/fermi-ware
 
 OBJDIR = object_${TRICK_HOST_CPU}
 LIBDIR = ${DPX_DIR}/lib_${TRICK_HOST_CPU}
@@ -38,7 +38,7 @@ endif
 
 DP_LIBS       = -L../../../lib_${TRICK_HOST_CPU} -llog -lvar -leqparse -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} -ltrick_units
 DPX_LIBS      = -L${DPX_DIR}/lib_${TRICK_HOST_CPU} -lDPC -lDPM
-FERMI_WARE_LIB = $(FERMI_WARE_HOME)/object_${TRICK_HOST_CPU}/libfermi.a
+FERMI_WARE_LIB = $(TRICK_HOME)/trick_source/data_products/fermi-ware/object_${TRICK_HOST_CPU}/libfermi.a
 
 ALL_LIBS = $(DPX_LIBS) $(FERMI_WARE_LIB) ${DP_LIBS} ${TRICK_UNIT_LIBS} $(LIBXML) ${HDF5_LIBRARY} -ldl $(FERMI_WARE_DIR)
 
diff --git a/trick_source/data_products/DPX/makefile b/trick_source/data_products/DPX/makefile
index 045ab09f..cb0379c7 100644
--- a/trick_source/data_products/DPX/makefile
+++ b/trick_source/data_products/DPX/makefile
@@ -14,7 +14,7 @@ LIBDIRS = DPM \
 
 APPDIRS = APPS/GXPLOT
 
-ifneq ($(FERMI_WARE_HOME),)
+ifneq ("$(wildcard ${TRICK_HOME}/trick_source/data_products/fermi-ware)","")
 APPDIRS += APPS/FXPLOT
 endif
 
diff --git a/trick_source/data_products/makefile b/trick_source/data_products/makefile
index 0effef18..a8624594 100644
--- a/trick_source/data_products/makefile
+++ b/trick_source/data_products/makefile
@@ -14,8 +14,8 @@ LIBDIRS = Var \
     Log \
     EQParse
 
-ifneq ($(FERMI_WARE_HOME),)
-LIBDIRS += $(FERMI_WARE_HOME)
+ifneq ("$(wildcard fermi-ware)","")
+LIBDIRS += fermi-ware
 endif
 
 APPDIRS = DPX \
diff --git a/trick_source/java/.gitignore b/trick_source/java/.gitignore
new file mode 100644
index 00000000..9ef96044
--- /dev/null
+++ b/trick_source/java/.gitignore
@@ -0,0 +1,2 @@
+build
+