fixes
Merge branch 'master' of https://github.com/dp6ai/crazybid

Conflicts:
	app/views/listings/_bid_js.html.erb
	db/development.sqlite3
paperclip s3 and heroku
sqlite bundle
fixed postgres
Merge branch 'master' of https://github.com/dp6ai/crazybid
heroku