this was too easy
Merge branch 'master' of github.com:kylefrost/derived-data-killer

Conflicts:
	.gitignore