Merge branch 'master' into Dustin
Lots of small UI changes
Merge branch 'Dustin'
Merge branch 'master' into marty