Better gitignore
Merge branch 'master' of https://github.com/Gizburdt/Mage-Scaffold

Conflicts:
	.gitignore