testing integrating a bunch of remotes together
Merge pull request #6 from weaties/dev-dw-master-whatever

testing integrating a bunch of remotes together
Merge pull request #7 from weaties/master

promoting master to trunk with a pull request