Updates to mobile homepage river. Layout for non-carousel promos.
Committing merged _modules.scss after resolving one conflict. Mobile river updates.Merge branch 'master' of https://github.com/stephenrouse/heidi

Conflicts:
	scss/_modules.scss