Change axes_manager complex indexing syntax. See docstring for details
rollaxis now does nothing is axis1==axis2
Rebin now returns the object instead of operating in-place
Merge branch 'master' of https://github.com/hyperspy/hyperspy
BUG-FIX: test_add_lines was failing after renaming only_subshells to only_lines