DRY
fix travis filename
Merge branch 'master' into refactor-aggregation
be more idiomatic about autoinc
guard against unbound name in branch
tidy up conditions branches
be more careful re indexerror
be more careful re keyerror
add legibility blank lines
make poor man's autovivify slightly more affluent
bravely remove redundant safety checks
further improve key handling