moved vcr to test group in Gemfile
Merge branch 'master' of https://github.com/7maples/backchannel-app
Merge remote-tracking branch 'upstream/integrate_views'
integrated scheduler view with backend
modified schedule view page
resolved conflicts
updated conference show view, fixed specs, updated routes