Make consistency changes

Change code indentation in `normalize.css` from 2 to 4 spaces. This
is done in order to be consistent with the indentation used in the
other files.
Update to Apache Server Configs 2.2.0
Merge remote-tracking branch 'base/master'