Merge pull request #9 from kdmurray91/dev

Pylint fixes and Json maker & parallel undist
Merge pull request #10 from kdmurray91/dev

Misc resizeTS changes
Merge remote-tracking branch 'upstream/master'