Cleanup gitignore, adding back Makefile
Merge pull request #290 from igordezky/master

Cleanup gitignore, adding back Makefile