updated rescale example to reflect bug fix
merging with upstream
updating to master
fixed typos
Merge pull request #6 from ericheep/master

type in readme