initial commit
Merge branch 'master' of github.com:adamclerk/osxpyinstaller

Conflicts:
	.gitignore