Correcting a join test to be consistent with numpy convention--
when accessing multiple columns, order is specified by the order
in which they were asked for.
Merge branch 'develop' into elaine_working