Added roxygen script.  Fixed some documentation errors.  Unknown errors prevent roxygen from finishing.
Resolved conflicts.