Revert "Fixes gitignore to ignore directories properly"

This reverts commit e6c69ed3d26b3b4da5f952b5241bb23449487bcb.
Merge pull request #131 from austinpray/revertgitignore

Revert "Fixes gitignore to ignore directories properly"
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore