Merge pull request #1 from stephancom/master

a few deployment and development tweaks
finally figure out bidding selection
Merge branch 'master' of https://github.com/blackjacket401/zertica-changed
push to gitgub
Merge branch 'master' of github.com:blackjacket401/zertica-changed

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/blackjacket401/zertica-changed

Conflicts:
	app/assets/stylesheets/style.css