add master branch tracking to the submodules; split out the deprecated JBTIS stuff >> master