Simplify CPU type
Merge branch 'master' of github.com:reenigne/reenigne