diff --git a/contrib/platform/cisco/macosx-dynamic b/contrib/platform/cisco/macosx-dynamic
index 26b301d684..7fadd0ea16 100644
--- a/contrib/platform/cisco/macosx-dynamic
+++ b/contrib/platform/cisco/macosx-dynamic
@@ -20,7 +20,8 @@ enable_mpi_f90=no
 enable_mpi_cxx=no
 enable_mpi_cxx_seek=no
 enable_memchecker=no
-enable_mca_no_build=carto,crs,memchecker,filem,plm-slurm,plm-xgrid,snapc
+enable_mca_no_build=carto,crs,memchecker,filem,plm-slurm,plm-xgrid,snapc,ess-slurm,ess-slurmd
 with_memory_manager=no
 with_devel_headers=yes
 with_xgrid=no
+with_slurm=no
diff --git a/contrib/platform/iu/odin/openmpi-mca-params.conf b/contrib/platform/iu/odin/debug.conf
similarity index 100%
rename from contrib/platform/iu/odin/openmpi-mca-params.conf
rename to contrib/platform/iu/odin/debug.conf
diff --git a/contrib/platform/iu/odin/optimized.conf b/contrib/platform/iu/odin/optimized.conf
new file mode 100644
index 0000000000..ce9c19bc42
--- /dev/null
+++ b/contrib/platform/iu/odin/optimized.conf
@@ -0,0 +1,94 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 0
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+plm = slurm,rsh
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+oob_tcp_disable_family = IPv6 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,openib,self 
+#mpi_leave_pinned = 1
+
+## Setup shared memory
+btl_sm_free_list_max = 768
+
+## Setup OpenIB
+btl_openib_want_fork_support = 0 
+btl_openib_cpc_include = oob 
+#btl_openib_receive_queues = P,128,256,64,32,32:S,2048,1024,128,32:S,12288,1024,128,32:S,65536,1024,128,32 
+
+## Setup TCP
+btl_tcp_if_include = ib0
+
+## Configure the PML
+pml_ob1_use_early_completion = 0
+                                                                      
+## Enable cpu affinity 
+opal_paffinity_alone = 1 
diff --git a/contrib/platform/iu/odin/static b/contrib/platform/iu/odin/static
new file mode 100644
index 0000000000..a65093eafd
--- /dev/null
+++ b/contrib/platform/iu/odin/static
@@ -0,0 +1,28 @@
+enable_opal_multi_threads=yes
+enable_multicast=yes
+enable_dlopen=no
+enable_pty_support=no
+with_blcr=no
+with_openib=yes
+with_memory_manager=no
+enable_mem_debug=yes
+enable_mem_profile=no
+enable_debug_symbols=yes
+enable_binaries=yes
+with_devel_headers=yes
+enable_heterogeneous=no
+enable_picky=yes
+enable_debug=yes
+enable_shared=no
+enable_static=yes
+with_slurm=yes
+enable_contrib_no_build=libnbc,vt
+enable_visibility=yes
+enable_memchecker=no
+enable_ipv6=no
+enable_mpi_f77=no
+enable_mpi_f90=no
+enable_mpi_cxx=no
+enable_mpi_cxx_seek=no
+enable_mca_no_build=pml-dr,pml-crcp2,crcp
+enable_io_romio=no
diff --git a/contrib/platform/iu/odin/static.conf b/contrib/platform/iu/odin/static.conf
new file mode 100644
index 0000000000..ce9c19bc42
--- /dev/null
+++ b/contrib/platform/iu/odin/static.conf
@@ -0,0 +1,94 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This is the default system-wide MCA parameters defaults file.
+# Specifically, the MCA parameter "mca_param_files" defaults to a
+# value of
+# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
+# (this file is the latter of the two).  So if the default value of
+# mca_param_files is not changed, this file is used to set system-wide
+# MCA parameters.  This file can therefore be used to set system-wide
+# default MCA parameters for all users.  Of course, users can override
+# these values if they want, but this file is an excellent location
+# for setting system-specific MCA parameters for those users who don't
+# know / care enough to investigate the proper values for them.
+
+# Note that this file is only applicable where it is visible (in a
+# filesystem sense).  Specifically, MPI processes each read this file
+# during their startup to determine what default values for MCA
+# parameters should be used.  mpirun does not bundle up the values in
+# this file from the node where it was run and send them to all nodes;
+# the default value decisions are effectively distributed.  Hence,
+# these values are only applicable on nodes that "see" this file.  If
+# $sysconf is a directory on a local disk, it is likely that changes
+# to this file will need to be propagated to other nodes.  If $sysconf
+# is a directory that is shared via a networked filesystem, changes to
+# this file will be visible to all nodes that share this $sysconf.
+
+# The format is straightforward: one per line, mca_param_name =
+# rvalue.  Quoting is ignored (so if you use quotes or escape
+# characters, they'll be included as part of the value).  For example:
+
+# Disable run-time MPI parameter checking
+#   mpi_param_check = 0
+
+# Note that the value "~/" will be expanded to the current user's home
+# directory.  For example:
+
+# Change component loading path
+#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
+
+# See "ompi_info --param all all" for a full listing of Open MPI MCA
+# parameters available and their default values.
+#
+
+# Basic behavior to smooth startup
+mca_component_show_load_errors = 0
+mpi_param_check = 0 
+orte_abort_timeout = 10 
+plm = slurm,rsh
+
+## Protect the shared file systems
+
+## Add the interface for out-of-band communication
+## and set it up
+oob_tcp_peer_retries = 120 
+oob_tcp_disable_family = IPv6 
+#oob_tcp_connect_timeout=600 
+
+## Define the MPI interconnects
+btl = sm,openib,self 
+#mpi_leave_pinned = 1
+
+## Setup shared memory
+btl_sm_free_list_max = 768
+
+## Setup OpenIB
+btl_openib_want_fork_support = 0 
+btl_openib_cpc_include = oob 
+#btl_openib_receive_queues = P,128,256,64,32,32:S,2048,1024,128,32:S,12288,1024,128,32:S,65536,1024,128,32 
+
+## Setup TCP
+btl_tcp_if_include = ib0
+
+## Configure the PML
+pml_ob1_use_early_completion = 0
+                                                                      
+## Enable cpu affinity 
+opal_paffinity_alone = 1