Merge branch 'master', remote-tracking branch 'whiskyweb/master'
Shifting Phil for Robert on the schedule
Merge pull request #101 from dragoonis/feature/schedule-shift

Shifting Robert for Phil on the schedule
Merge branch 'master' into gh-pages