Cleaning up genie files and adding osx stuff to makefile