fixed
Merge pull request #52 from daithi-coombes/amalgamate-dirs

almagamate includes/ and vendor/ dirs