Changes as a result of testing.
Merge pull request #6 from mortardata/cmiller_cluster_enum_move

Changes as a result of testing.