Merge pull request #24 from wjdix/master

Makes stuff more better.
Pull out a cluster to make integration tests easier.
Merge pull request #25 from benmills/master

Pull out a cluster to make integration tests easier.