Fixed grep bug
Merge pull request #155 from jbondhus/master

Fixed grep bug
Merge remote-tracking branch 'upstream/master'

Conflicts:
	minecraft