Added inline-block mixin as now deprecated in bourbon.
Merge branch 'master' into JP-onpage-framing-suggestions