extensive test setup on master, new contrib branch
Merge branch 'master' of github.com-swergroup:swergroup/uploadplus
cleanup ordering, props Jonas Lundman