Merge makefile and gitignore changes into experimental