basic hours support
Merge branch 'master' of https://github.com/fyndo/auxdb

Matt's typo fix
(more) proper aps11 layout