Merge pull request #371 from koenpunt/single-installer

Merged installer and gitless installer into one