Merge pull request #17 from bitsculpt/dan-branch

Factory fixes. Cluster acceptance tests.