Merge pull request #26 from andrewboie/master

x86 config updates