Removing commented-out options.
Merge branch 'master' of github.com:PaulOstazeski/dotfiles
Adding formatting options