fix and consolidate some CSS
get rid of the flash notice timeout
Merge branch 'master' into kill_notices_on_timeout_with_fire

Conflicts:
	app/assets/stylesheets/master.css.scss
	app/assets/stylesheets/splash_page.css.scss
Merge branch 'kill_notices_on_timeout_with_fire'