Updated formatting options, status line, and stuff.
Merge branch 'master' into mac