Updated for R2 changes. Fixed some sphinx warnings.
Merge pull request #72 from bensternthal/Doc-Update

Updated for R2 changes. Fixed some sphinx warnings.