revert default ntup dir
Makefile fix
bootstrapping and jackknife
fix weighted CBA mass workspaces
Merge pull request #35 from ndawe/master

WIP: fix weighted mass CBA workspace and implement bootstrap/jackknife