Cleaned up swap statement
Merge branch 'master' of github.com:MSeal/agglom_cluster into chore/todoRemoval