Merged Entity/EntityManager ideas into world - so no more circular dependencies, whilst improving performance.
Changed RenderSystem/WaterSystem to use iterator/index based for loops that can be parallelized with cilk.
Fixed Makefile to resolve OSX compilation issues (had to upgrade to ICC 14.0.3)