keep fixtures in upload order
Merge pull request #381 from dimagi/sort-fixtures

keep fixtures in upload order
Merge branch 'master' into qwerty
give better error message for querty pre-2.6