Uncommitted changes from spencer's svn working copy

This branch will be deleted after individual changes
are merged into appropriate feature branches.