Fixed merge conflict with color-schemes branch
Fixed merge conflict with color-schemes branch

walshjon/openmc,kellyrowland/openmc,shikhar413/openmc,paulromano/openmc,amandalund/openmc,johnnyliu27/openmc,wbinventor/openmc,smharper/openmc,wbinventor/openmc,walshjon/openmc,smharper/openmc,smharper/openmc,shikhar413/openmc,liangjg/openmc,kellyrowland/openmc,samuelshaner/openmc,mit-crpg/openmc,liangjg/openmc,walshjon/openmc,bhermanmit/openmc,smharper/openmc,paulromano/openmc,amandalund/openmc,shikhar413/openmc,samuelshaner/openmc,mit-crpg/openmc,mit-crpg/openmc,walshjon/openmc,johnnyliu27/openmc,mit-crpg/openmc,samuelshaner/openmc,paulromano/openmc,samuelshaner/openmc,mjlong/openmc,amandalund/openmc,johnnyliu27/openmc,liangjg/openmc,shikhar413/openmc,johnnyliu27/openmc,mjlong/openmc,bhermanmit/openmc,wbinventor/openmc,paulromano/openmc,wbinventor/openmc,liangjg/openmc,amandalund/openmc