Merge branch 'release/2.5.0'
Fix duplicate pill-left by changing one to -right
Fix if statement logic errors.

Shape mixin was writing all possibilities instead of selection
based on argument. Was due to multiple @ifs without @else and
illegal conditional.
Bump version.
Merge branch 'hotfix/2.5.1' into develop