Makefile

Add a makefile. Also includes the cleanup branch changes.