AdamPresley.com specific header and footer changes.
Merge branch 'features/s3'
Merge branch 'origin/master'