Changes to be able to run scripts with new rootpy/matplotlib and some small corrections