Added makefile to .gitignore
Merge branch 'master' of https://github.com/noah-black/Vespula