Merge branch 'master' of http://github.com/bobthenameless/musthe

Conflicts:
	README.md
scales now is a stand-alone function, as suggested by a redditor
readme changes
merge with latest upstream
Merge branch 'master' of http://github.com/bobthenameless/musthe

Conflicts:
	README.md