Added separate API keys for different streams
Merge remote-tracking branch 'origin/master' into refactoring-delayed-job-rake-tasks

Conflicts:
	Rakefile
Cleaned up the views
Merged clean home page with master