config-sample.php gets a special mention because otherwise git won't accept it...
Fixing the social sharers and whipping out some padding for them
Merge branch 'two-page-onwards' of https://github.com/tomslominski/infinity-squared into two-page-onwards

Because git broke. Or I broke git.