Fixed up MiMa build settings for master
Merge pull request #755 from jroper/mastermima

Fixed up MiMa build settings for master