Finished _hyListOrderable test; fixed Merge; added the && operator
Merge branch 'v3-template' of github.com:spond/hyphy into v3-template