Merge cbrightsci fork into main project.

I'm not sure how to fix this. When I pull it up in my project the 
indents all look right to me. I changed the setting of my tab to default 
to 2 spaces for the future. I guess I'll need to open it in a different 
program for now to see if the indentation discrepancy is apparent in there.

-Chris

On 12/18/2014 10:46 PM, Dan White wrote:
>
> In src/Interface/Modules/Render/ES/SRInterface.h 
> <https://github.com/SCIInstitute/SCIRun/pull/740#discussion-diff-22090694>:
>
> > -      Core::Datatypes::GeometryObject::RenderType renderType;
> > -    };
> > -
> > -    std::string           mName;
> > -    glm::mat4             mObjectToWorld;
> > -    std::list<SRPass>     mPasses;
> > -    Core::Geometry::BBox  mBBox;          ///< Objects bounding box (calculated from VBO).
> > -
> > -    boost::optional<std::string>    mColorMap;
> > -  };
> > -
> > -  // Sets up ESCore.
> > -  void setupCore();
> > +	namespace Render {
> > +
> > +		class SRCamera;
>
> @cbrightsci <https://github.com/cbrightsci> I think your VS tab/space 
> settings are off--these tabs look huge. Can you reformat with 2-space 
> tabs going forward?
>
> —
> Reply to this email directly or view it on GitHub 
> <https://github.com/SCIInstitute/SCIRun/pull/740/files#r22090694>.
>