merge
Merge branch 'npred_cube2' of github.com:ellisowen/gammapy into npred_cube2
update