cleanups libRocket build
fixing merge issues