checkpoint
Passing tests. Need to write a few more.
Bug fixes, version bump, new binary.
Merge branch 'master' into testability-refactor

Conflicts:
	ploy.gemspec