fix toolbar styles getting hosed by foundation
Merge branch 'master' of github.com:alexweber/f8n

Conflicts:
	scss/_drupal.scss