corrected indentation of script tags, other minor refactoring
Merge branch 'develop' of ssh://github.com/mtdbass5/audio-testing into develop