Refreshed vundle; added makefile formatting