improving table plot
fixed merge conflicts
added keymaster to bower