Fix ntuples imports
Merge branch 'analysis' of ssh://github.com/alexpearce/CharmProduction into analysis