Merge pull request #930 from alex/switch-order

Try running the OS X builds first and see if it's faster