merging changes to master

Changes:
Everything you guys did

This looks really good right now.  Now I'm going to get cracking on making it do more things.