small changes
Merge branch 'DCRedefine' of ssh://github.com/dream3d/DREAM3D into DCRedefine
continuing with working on errors
Merge branch 'DCRedefine' of ssh://github.com/dream3d/DREAM3D into DCRedefine
Merge branch 'DCRedefine' of ssh://github.com/dream3d/DREAM3D into DCRedefine
gettign synced back up with Jackson
fixing merge