cleans up for style and readability
clarifies some var names
Merge branch 'cli' of github.com:styleseek/hyperdrive into cli

Conflicts:
	lib/hyperdrive/docs.rb