Minor updates
update .gitignore
Various updates
bundle etoolbox
Add Makefile
Shorten a bit more