Removing work from master.

Mainline development is occuring on the devel branch. The master branch will receive work upon completion of milestones.