Fix up some EE layouts
merge master
add aae config
Merge pull request #206 from basho/ee_fixes

1.3 version fixes