Merge branch 'master' into Dustin
formatting changes, small ux fixes.
Merge branch 'Dustin'