Formatting tweaks

A few formatting tweaks here and there, also updated a few preferences
and the gitignore.