testing sidekiq

sidekiq with its dashboard
production database details

+ heroku database details
Merge branch 'master' into sidekiq

Conflicts:
	config/database.yml
	db/schema.rb
fixed indentation on database.yml

- removed tabbing
+ added double spacing
heroku database env config

- removed manual dev config
+ added env config for heroku