Table -> Map, MultiTable -> Multimap
Reorder things
Update Travis