progress bar complete, minor bug fixes
foo
Merge branch 'master' of github.com:leviramsey/tumbleweed
Merge branch 'master' of git://github.com/mikesteele/tumbleweed