-- updated lots of stuff.
Merge branch 'master' of https://github.com/JasonLautzenheiser/I7-Tom