Updated definition of types in m_prototype, m_data, m_container, etc. and redefinition of container macros.  Changes in model code to use new container macros.
Merge branch 'master' of https://github.com/anl-tracc/polaris