set up application.rb to include application.yml
Merge remote-tracking branch 'origin/master'