Simplify configuration regex
Merge branch 'master' of https://github.com/christopho/solarus
Force all cpu with OSX build
Merge branch 'master' of https://github.com/christopho/solarus