lock down guard until all plugins updated
make sure to import perfect scrollbar plugin before our own mixins

otherwise it overrides the border-radius mixin with an incompatible one
Merge remote-tracking branch 'upstream/develop' into pod.jpope.org