renamed __align to __align__ to work around issues under OSX Maverics
Merge branch 'v2.0' of https://github.com/embree/embree into v2.0