remove brew cellar from repo
include updated schema in repo
get rid of unused bid.css.scss file
drop in purchased home page
Merge branch 'refs/heads/ericMaster'
Merge branch 'refs/heads/ericMaster'

Conflicts:
	app/views/layouts/_navigation.html.slim
	public/style.css
Merge branch 'refs/heads/ericMaster'

Conflicts:
	app/views/layouts/_navigation.html.slim
Merge branch 'refs/heads/ericMaster'

Conflicts:
	app/views/layouts/_navigation.html.slim
	db/schema.rb
balanced coffee script fixes
only force SSL in production
Merge branch 'master' of https://github.com/stephancom/zertica-changed
Merge pull request #14 from stephancom/master

fix for balanced payments coffee script