Auto merge of #679 - edunham:mac9, r=larsbergstrom
Auto merge of #679 - edunham:mac9, r=larsbergstrom

Mac9 is ready

* Return mac1 to rotation
* Remove macpro1
* Add mac9
* Switch the whole thing to a nice list comprehension

This finishes up the work from https://github.com/servo/saltfs/issues/674

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/679)
<!-- Reviewable:end -->

servo/saltfs,servo/saltfs