bower/tablesort stuff
removed some junk
this is how we merge