real sass maps that use variables must be declared independently
Merge branch 'master' into modular

Conflicts:
	_screen.scss
	css/screen.css