remove build files, fix compilation on os x
merge