Fix column padding v2

Adjust media queries.
Fix column padding v3

Fix Contact side bar.
Fix column padding v3

Fix columns on aside-free pages.
Merge branch 'master' into fix_column_padding

Conflicts:
	index.html
Fix aside from merge.