lastest updates - this commit includes a lot.
Merge branch 'master' of https://github.com/glmason/allTownTech