Changed header data to use less that 80 chars. Placed two blank lines between function definitions. Removed commented code from end portion of file.
Merge branch 'master' into pep8-cleanup