0910-1006

cleanup of scss continues

Signed-off-by: Steve Lombardi <steve.lombardi@pb.com>
Merge branch 'master' of https://github.com/PBGUX/designsystem

Signed-off-by: Steve Lombardi <steve.lombardi@pb.com>

Conflicts:
	dist/styles/design_system.css