fixed public view.  Started on fixing pivotal sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/public.css.scss
	app/views/layouts/application.html.haml
	app/views/layouts/public.html.haml
	app/views/public/index.html.erb
public changes