Started adding in some of the files taken from dev-master branch I start working on over at SourceForge before deciding to move the new development to Github