Merge pull request #21 from ThirdPlanetOut/master

docs
Merge remote-tracking branches 'origin/beta' and 'origin/docs' into beta
turning off broken tests
Merge pull request #22 from ThirdPlanetOut/beta

Beta