Plenty of changes to UI, too many to enumerate.
Merge branch 'master' into NateUICleanupMore
Merged from master, some problems, getting Cameron's latest to fix.
Merge branch 'master' into NateUICleanupMore
All merged up and ready to go.
Merge pull request #66 from cameronklein/NateUICleanupMore

Nate ui cleanup more