Beta 0.7
Merge branch 'master' of github.com:bartsmit/bedtime