config.ru for static serving, /shift/ for our app
Merge branch 'lawrie'