style updates
Merge branch 'master' of github.com:jeremykao/Twine
progress bar work
merge fixes