All updates and fixes merged

Includes all changes made by Chad (mc12345678) as well as removal of
more remaining legacy v1.3.9 code.
Minor change
Misc
Revert "Misc"

This reverts commit eb6d716376286ca45dfdfca8ea4b16b67edbe837.
another github is acting strange merge
Merge pull request #17 from DivaVocals/v1.3a

Update the master with all the latest changes