merge my fork into yours, don't just accept this

if you accept this pull it will over rite every file here, it is a complete rewrite of almost all code. some of the code will need to be modified to work in your repo (the html stuff and the shell script.

I also removed a lot of old files that are no longer compatible with the new xml layout.